diff options
author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-16 08:06:04 +0100 |
---|---|---|
committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-16 08:06:04 +0100 |
commit | 9e746b504fd0f1367cce6353ac51f71327d8fb75 (patch) | |
tree | a86bf9534cbb2ac6c497cf1874697350a387fd9e /view/en/msg-header.tpl | |
parent | 53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1 (diff) | |
parent | 97723ad69f71c716bd0e68eec95944b5469008ec (diff) | |
download | volse-hubzilla-9e746b504fd0f1367cce6353ac51f71327d8fb75.tar.gz volse-hubzilla-9e746b504fd0f1367cce6353ac51f71327d8fb75.tar.bz2 volse-hubzilla-9e746b504fd0f1367cce6353ac51f71327d8fb75.zip |
Merge branch 'master' of github.com:fabrixxm/friendika
Diffstat (limited to 'view/en/msg-header.tpl')
-rw-r--r-- | view/en/msg-header.tpl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/view/en/msg-header.tpl b/view/en/msg-header.tpl index 3d2567f62..174e6c985 100644 --- a/view/en/msg-header.tpl +++ b/view/en/msg-header.tpl @@ -6,14 +6,14 @@ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", + 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_styles : "Code=codeStyle;Quote=quoteStyle", - content_css : "bbcode.css", + theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -44,8 +44,12 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + } }); </script> |