X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fjot-header.tpl;h=352c48647e04a0032609239b3a36a1d1b6210261;hb=a69ecb341371cf0a1c2847ff19abd88f362021c9;hp=8174026abbdf4071e769e82862dac8140b72fad1;hpb=20ca4512000e80386fe6f9b3fd85864bc0e91627;p=friendica.git

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 8174026abb..352c48647e 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -7,6 +7,7 @@ var textlen = 0;
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").show();	
+		$("#jot-title-desc").show();
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
@@ -30,9 +31,26 @@ function initEditor(cb){
 			content_css: "$baseurl/view/custom_tinymce.css",
 			theme_advanced_path : false,
 			setup : function(ed) {
-				 //Character count
+				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);
@@ -41,6 +59,8 @@ function initEditor(cb){
 						$('#profile-jot-desc').html(' ');
 					}	 
 
+				 //Character count
+
 					if(textlen <= 140) {
 						$('#character-counter').removeClass('red');
 						$('#character-counter').removeClass('orange');
@@ -62,7 +82,7 @@ function initEditor(cb){
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
 					$("#profile-jot-text-loading").hide();
-					$("#profile-jot-submit-wrapper").show();
+					$(".jothidden").show();
 					if (typeof cb!="undefined") cb();
 				});
 
@@ -71,27 +91,32 @@ function initEditor(cb){
 		editor = true;
 		// setup acl popup
 		$("a#jot-perms-icon").fancybox({
-			'transitionIn' : 'none',
-			'transitionOut' : 'none'
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
 		}); 
 	} else {
 		if (typeof cb!="undefined") cb();
 	}
 }
 
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
 </script>
 <script type="text/javascript" src="js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
+
 	$(document).ready(function() {
 		
-		/* enable tinymce on focus */
-		$("#profile-jot-text").focus(function(){
-			if (editor) return;
-			$(this).val("");
-			initEditor();
-		});
-		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
 	
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
@@ -142,20 +167,13 @@ function initEditor(cb){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
+			$.get('parse_url?binurl=' + reply, function(data) {
 				tinyMCE.execCommand('mceInsertRawHTML',false,data);
 				$('#profile-rotator').hide();
 			});
 		}
 	}
 
-	function jotGetVideo() {
-		reply = prompt("$utubeurl");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
-		}
-	}
-
 	function jotVideoURL() {
 		reply = prompt("$vidurl");
 		if(reply && reply.length) {
@@ -210,8 +228,9 @@ function initEditor(cb){
 		event.target.textContent = reply;
 		event.preventDefault();
 		if(reply && reply.length) {
+			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
+			$.get('parse_url?binurl=' + reply, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					tinyMCE.execCommand('mceInsertRawHTML',false,data);
@@ -221,6 +240,23 @@ function initEditor(cb){
 		}
 	}
 
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();