X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fjot-header.tpl;h=808d51126224570f423b4f6c71a9b900182f8683;hb=ba967386f4f2c1d5977f1ac4ac4473ad892e366b;hp=d12293f04c7743a1896b13687b60c45fc27b2cf2;hpb=35bd5792bc0362d169fabeca3eb41aea1fc8bb2f;p=friendica.git

diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
index d12293f04c..808d511262 100644
--- a/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@@ -2,156 +2,70 @@
 
 <script language="javascript" type="text/javascript">
 
-var editor=false;
+var editor = false;
 var textlen = 0;
-var plaintext = '{{$editselect}}';
 
-function initEditor(cb){
-	if (editor==false){
+function initEditor(callback) {
+	if (editor == false) {
 		var  colorbox_options = {
-			{{if $APP->is_mobile}}
+			{{if $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").editor_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").colorbox(colorbox_options);
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: {{$editselect}},
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, inlinepopups",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			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",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: "{{$baseurl}}/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&nbsp;');
-					}
-
-				 //Character count
 
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
+		$("#profile-jot-text-loading").show();
+		$("#profile-jot-text-loading").hide();
+		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+		$("#profile-jot-text").editor_autocomplete(baseurl + '/search/acl');
+		$("#profile-jot-text").bbco_autocomplete('bbcode');
+		$("a#jot-perms-icon").colorbox(colorbox_options);
+		$(".jothidden").show();
 
-			}
+		$("#profile-jot-text").keyup(function(){
+			var textlen = $(this).val().length;
+			$('#character-counter').text(textlen);
 		});
+
 		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox(colorbox_options);
-	} else {
-		if (typeof cb!="undefined") cb();
+	}
+	if (typeof callback != "undefined") {
+		callback();
 	}
 }
 
 function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
+	if (editor) {
+		return;
+	}
+	$(this).val('');
 	initEditor();
 }
 
 </script>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script>
-	var ispublic = '{{$ispublic}}';
+	var ispublic = '{{$ispublic nofilter}}';
 
 
 	$(document).ready(function() {
 
-		/* enable tinymce on focus and click */
+		/* enable editor on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
 
-
-
-
 		/* show images / file browser window
 		 *
 		 **/
 
 		/* callback */
-		$('body').on('fbrowser.image.main', function(e, filename, embedcode, id) {
+		$('body').on('fbrowser.photo.main', function(e, filename, embedcode, id) {
 			$.colorbox.close();
 			addeditortext(embedcode);
 		});
-		$('body').on('fbrowser.file.main', function(e, filename, embedcode, id) {
+		$('body').on('fbrowser.attachment.main', function(e, filename, embedcode, id) {
 			$.colorbox.close();
 			addeditortext(embedcode);
 		});
@@ -163,33 +77,6 @@ function enableOnUser(){
 		$('#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();
-					}
-				}
-			);
-
-		}
-		**/
 	});
 
 
@@ -221,7 +108,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
+			$.get('parseurl?binurl=' + reply, function(data) {
 				addeditortext(data);
 				$('#profile-rotator').hide();
 			});
@@ -254,7 +141,7 @@ function enableOnUser(){
 		if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
 		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
+		$.get('post/' + id + '/share', function(data) {
 			if (!editor) $("#profile-jot-text").val("");
 			initEditor(function(){
 				addeditortext(data);
@@ -278,7 +165,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
+			$.get('parseurl?binurl=' + reply, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
@@ -297,7 +184,7 @@ function enableOnUser(){
 				commentBusy = true;
 				$('body').css('cursor', 'wait');
 
-				$.get('tagger/' + id + '?term=' + reply);
+				$.post('post/' + id + '/tag/add', {term: reply});
 				if(timer) clearTimeout(timer);
 				timer = setTimeout(NavUpdate,3000);
 				liking = 1;
@@ -328,6 +215,7 @@ function enableOnUser(){
 //					if(timer) clearTimeout(timer);
 //					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
+					force_update = true;
 					$.colorbox.close();
 				} else {
 					$("#id_term").css("border-color","#FF0000");
@@ -344,15 +232,11 @@ function enableOnUser(){
 	}
 
 	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+		var currentText = $("#profile-jot-text").val();
+		$("#profile-jot-text").val(currentText + data);
 	}
 
-	{{$geotag}}
+	{{$geotag nofilter}}
 
 </script>