diff options
| author | Michael <icarus@dabo.de> | 2012-05-16 08:10:28 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-16 08:10:28 +0200 |
| commit | 2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (patch) | |
| tree | 8c569c61c06e50c943addc132286d44c2f8ec178 /view/theme/dispy-dark/jot-header.tpl | |
| parent | 188829ed46be6d3c7a91380226e26e8292c327be (diff) | |
| parent | a3f08c44be78d4517e9f1619811def09b2ec7e7a (diff) | |
| download | volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.gz volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.bz2 volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'view/theme/dispy-dark/jot-header.tpl')
| -rw-r--r-- | view/theme/dispy-dark/jot-header.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 44120da40..ab15f9516 100644 --- a/view/theme/dispy-dark/jot-header.tpl +++ b/view/theme/dispy-dark/jot-header.tpl @@ -24,7 +24,7 @@ function initEditor(cb) { mode : "specific_textareas", editor_selector: $editselect, auto_focus: "profile-jot-text", - plugins : "bbcode,paste,fullscreen,autoresize", + plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", @@ -36,12 +36,13 @@ function initEditor(cb) { entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, - force_p_newlines : true, + 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, + file_browser_callback : "fcFileBrowser", setup : function(ed) { cPopup = null; ed.onKeyDown.add(function(ed,e) { @@ -346,4 +347,3 @@ function enableOnUser(){ } </script> - |