X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftemplates%2Fjot-header.tpl;h=7498bfc4221648892feff2b7126c721c2c2696bc;hb=bcee356f661c02dc6f4d92bd223d293638d30475;hp=f8cf96f7c3b2652582a8150831afd7da6c4c39d7;hpb=191595766d399cfd012a10ef6f14f97c8ab87d1d;p=friendica.git

diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
index f8cf96f7c3..7498bfc422 100644
--- a/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@@ -8,20 +8,29 @@ var plaintext = '{{$editselect}}';
 
 function initEditor(cb){
 	if (editor==false){
+		var  colorbox_options = {
+			{{if $APP->is_mobile}}
+			'width' : '100%',
+			'height' : '100%',
+			{{/if}}
+			'inline' : true,
+			'transition' : 'elastic'
+		}
+		
+		
+		
 		$("#profile-jot-text-loading").show();
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+			$("#profile-jot-text").bbco_autocomplete('bbcode');
 			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
+			$("a#jot-perms-icon").colorbox(colorbox_options);
 			$(".jothidden").show();
 			if (typeof cb!="undefined") cb();
 			return;
-		}	
+		}
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
@@ -34,6 +43,7 @@ function initEditor(cb){
 			theme_advanced_toolbar_location : "top",
 			theme_advanced_toolbar_align : "center",
 			theme_advanced_blockformats : "blockquote,code",
+			theme_advanced_resizing : true,
 			gecko_spellcheck : true,
 			paste_text_sticky : true,
 			entity_encoding : "raw",
@@ -73,7 +83,7 @@ function initEditor(cb){
 					}
 					else {
 						$('#profile-jot-desc').html(' ');
-					}	 
+					}
 
 				 //Character count
 
@@ -106,10 +116,7 @@ function initEditor(cb){
 		});
 		editor = true;
 		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
+		$("a#jot-perms-icon").colorbox(colorbox_options);
 	} else {
 		if (typeof cb!="undefined") cb();
 	}
@@ -126,38 +133,67 @@ function enableOnUser(){
 <script>
 	var ispublic = '{{$ispublic}}';
 
+
 	$(document).ready(function() {
-		
+
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/{{$nickname}}',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
 
 
+
+		/* show images / file browser window
+		 *
+		 **/
+
+		/* callback */
+		$('body').on('fbrowser.image.main', function(e, filename, embedcode, id) {
+			$.colorbox.close();
+			addeditortext(embedcode);
+		});
+		$('body').on('fbrowser.file.main', function(e, filename, embedcode, id) {
+			$.colorbox.close();
+			addeditortext(embedcode);
+		});
+
+		$('#wall-image-upload').on('click', function(){
+			Dialog.doImageBrowser("main");
+		});
+
+		$('#wall-file-upload').on('click', function(){
+			Dialog.doFileBrowser("main");
+		});
+
+		/**
+			var uploader = new window.AjaxUpload(
+				'wall-image-upload',
+				{ action: 'wall_upload/{{$nickname}}',
+					name: 'userfile',
+					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+					onComplete: function(file,response) {
+						addeditortext(response);
+						$('#profile-rotator').hide();
+					}
+				}
+			);
+			var file_uploader = new window.AjaxUpload(
+				'wall-file-upload',
+				{ action: 'wall_attach/{{$nickname}}',
+					name: 'userfile',
+					onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+					onComplete: function(file,response) {
+						addeditortext(response);
+						$('#profile-rotator').hide();
+					}
+				}
+			);
+
+		}
+		**/
 	});
 
+
 	function deleteCheckedItems() {
 		if(confirm('{{$delitems}}')) {
 			var checkedstr = '';
@@ -173,7 +209,7 @@ function enableOnUser(){
 					else {
 						checkedstr = $(this).val();
 					}
-				}	
+				}
 			});
 			$.post('item', { dropitems: checkedstr }, function(data) {
 				window.location.reload();
@@ -271,9 +307,9 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		
+
 		var bordercolor = $("input").css("border-color");
-		
+
 		$.get('filer/', function(data){
 			$.colorbox({html:data});
 			$("#id_term").keypress(function(){
@@ -282,7 +318,7 @@ function enableOnUser(){
 			$("#select_term").change(function(){
 				$("#id_term").css("border-color",bordercolor);
 			})
-			
+
 			$("#filer_save").click(function(e){
 				e.preventDefault();
 				reply = $("#id_term").val();
@@ -300,7 +336,7 @@ function enableOnUser(){
 				return false;
 			});
 		});
-		
+
 	}
 
 	function jotClearLocation() {
@@ -315,7 +351,7 @@ function enableOnUser(){
 		}
 		else
 			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
+	}
 
 	{{$geotag}}