Merge branch 'master' of git://github.com/friendika/friendika

1 files changed, 79 insertions, 71 deletions

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 061f6a71d..8e671a0b3 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -4,75 +4,78 @@
 var editor=false;
 var textlen = 0;
 
-function initEditor(){
-	$("#profile-jot-text-loading").show();
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste,autoresize",
-		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",
-		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 : '',
-		convert_urls: false,
-		content_css: "$baseurl/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		setup : function(ed) {
-			 //Character count
-			ed.onKeyUp.add(function(ed, e) {
-				var txt = tinyMCE.activeEditor.getContent();
-				textlen = txt.length;
-				if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-					$('#profile-jot-desc').html(ispublic);
-				}
-				else {
-					$('#profile-jot-desc').html(' ');
-				}	 
-
-				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);
-			});
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();	
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: /(profile-jot-text|prvmail-text)/,
+			plugins : "bbcode,paste,autoresize",
+			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",
+			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 : '',
+			convert_urls: false,
+			content_css: "$baseurl/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			setup : function(ed) {
+				 //Character count
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&nbsp;');
+					}	 
+
+					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();
+					$("#profile-jot-submit-wrapper").show();
+					if (typeof cb!="undefined") cb();
+				});
 
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				$("#profile-jot-text-loading").hide();
-				$("#profile-jot-submit-wrapper").show();
-			});
-
-		}
-	});
-	editor = true;
-	
-	// setup acl popup
-	$("#profile-jot-acl-wrapper").hide();
-	$("a#jot-perms-icon").fancybox({
-		'transitionIn' : 'none',
-		'transitionOut' : 'none'
-	}); 
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'none',
+			'transitionOut' : 'none'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
 }
 
 </script>
@@ -181,12 +184,17 @@ function initEditor(){
 		}
 	}
 
+
 	function jotShare(id) {
 		$('#like-rotator-' + id).show();
+			
 		$.get('share/' + id, function(data) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-			$('#like-rotator-' + id).hide();
-			$(window).scrollTop(0);
+			initEditor(function(){
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
 		});
 	}