diff options
author | redmatrix <git@macgirvin.com> | 2016-08-21 19:40:11 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-08-21 19:40:11 -0700 |
commit | a3e0e67953da3450fcc82c22b87b7b677454ccb8 (patch) | |
tree | 034e2282894da671d589ec37a44f97fbab9738ae | |
parent | 7045b920efb6f5f9cd4a7eb2b7abaabe14b99634 (diff) | |
download | volse-hubzilla-a3e0e67953da3450fcc82c22b87b7b677454ccb8.tar.gz volse-hubzilla-a3e0e67953da3450fcc82c22b87b7b677454ccb8.tar.bz2 volse-hubzilla-a3e0e67953da3450fcc82c22b87b7b677454ccb8.zip |
remove references to tinymce which were causing console errors
-rwxr-xr-x | view/tpl/msg-header.tpl | 53 | ||||
-rwxr-xr-x | view/tpl/profed_head.tpl | 36 |
2 files changed, 4 insertions, 85 deletions
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 3407e152c..013e1cfdc 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,52 +1,9 @@ -<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script type="text/javascript" src="view/js/ajaxupload.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", - 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 : '', - 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"); -</script> -<script type="text/javascript" src="view/js/ajaxupload.js" ></script> -<script> $(document).ready(function() { var file_uploader = new window.AjaxUpload( @@ -114,12 +71,8 @@ else } function addmailtext(data) { - if(plaintext == 'none') { - var currentText = $("#prvmail-text").val(); - $("#prvmail-text").val(currentText + data); - } - else - tinyMCE.execCommand('mceInsertRawHTML',false,data); + var currentText = $("#prvmail-text").val(); + $("#prvmail-text").val(currentText + data); } diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl index 103960a76..ce774052a 100755 --- a/view/tpl/profed_head.tpl +++ b/view/tpl/profed_head.tpl @@ -1,36 +1,2 @@ -<script language="javascript" type="text/javascript" - src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> - <script language="javascript" type="text/javascript"> - - -tinyMCE.init({ - theme : "advanced", - mode : "{{$editselect}}", - plugins : "bbcode,paste", - 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", - 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 : '', - content_css: "{{$baseurl}}/view/custom_tinymce.css", - theme_advanced_path : false, - setup : function(ed) { - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - }); - } - -}); - - -</script> +<script language="javascript" type="text/javascript"></script> |