X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fmsg-header.tpl;h=d3728780029cea104f058a6c52d11df05f246db2;hb=4c52318c4ebfc5038295156d7ff085db9c980c8d;hp=ca91923524d0e04e76fd5aab4b1072afc2380358;hpb=98b62b80f3f08310e86b9bc4d9740526c50080c2;p=friendica.git

diff --git a/view/templates/msg-header.tpl b/view/templates/msg-header.tpl
index ca91923524..d372878002 100644
--- a/view/templates/msg-header.tpl
+++ b/view/templates/msg-header.tpl
@@ -1,54 +1,7 @@
-
-
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
-
-var plaintext = '{{$editselect}}';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		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",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-
-
+	$("#prvmail-text").editor_autocomplete(baseurl + '/search/acl');
 </script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script type="text/javascript" src="view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script>
 	$(document).ready(function() {
 		var uploader = new window.AjaxUpload(
@@ -57,25 +10,21 @@ else
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					addeditortext(response);
 					$('#profile-rotator').hide();
-				}				 
+				}
 			}
 		);
 
-		{{if $editselect = 'none'}}
 		$("#prvmail-text").bbco_autocomplete('bbcode');
-		{{/if}}
-
-
 	});
 
 	function jotGetLink() {
 		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
 			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			$.get('parseurl?url=' + reply, function(data) {
+				addeditortext(data);
 				$('#profile-rotator').hide();
 			});
 		}
@@ -93,12 +42,17 @@ else
 		event.preventDefault();
 		if(reply && reply.length) {
 			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			$.get('parseurl?url=' + reply, function(data) {
+				addeditortext(data);
 				$('#profile-rotator').hide();
 			});
 		}
 	}
 
+	function addeditortext(data) {
+		var currentText = $("#prvmail-text").val();
+		$("#prvmail-text").val(currentText + data);
+	}
+
 </script>