diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
| commit | 8a80ea24d1d8039be6dc532c9db23c60e71eb467 (patch) | |
| tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /view/jot-header.tpl | |
| parent | c4f4715a541ad89dfd348f14c4e25a83006e74e7 (diff) | |
| parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
| download | volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.gz volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.bz2 volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.zip | |
Merge remote-tracking branch 'upstream/master'
Merge upstream
Diffstat (limited to 'view/jot-header.tpl')
| -rw-r--r--[-rwxr-xr-x] | view/jot-header.tpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 67e5eb681..f1c283470 100755..100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -26,7 +26,7 @@ function initEditor(cb){ mode : "specific_textareas", editor_selector: $editselect, auto_focus: "profile-jot-text", - plugins : "bbcode,paste,autoresize", + plugins : "bbcode,paste,autoresize, inlinepopups", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", @@ -44,6 +44,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) { |