diff options
| author | zottel <github@zottel.net> | 2012-04-20 13:42:33 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-20 13:42:33 +0200 |
| commit | 9663299da1be50eef4327778fae619fc6f9edef4 (patch) | |
| tree | 5cd9b93f16c344cf896ac8d4e2a4a818fe21e783 /view/theme/dispy-dark/jot-header.tpl | |
| parent | 041f74dc775424f686a1cd95c00e0d63bfc4b99c (diff) | |
| parent | 0e25376e4afea4e5d96c233594feef0a35ca314c (diff) | |
| download | volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.gz volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.bz2 volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy-dark/jot-header.tpl')
| -rw-r--r-- | view/theme/dispy-dark/jot-header.tpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index c55ac503a..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 : "", @@ -42,6 +42,7 @@ function initEditor(cb) { 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) { |