diff options
| author | Tobias Hößl <tobias@hoessl.eu> | 2012-04-22 13:31:07 +0000 |
|---|---|---|
| committer | Tobias Hößl <tobias@hoessl.eu> | 2012-04-22 13:31:07 +0000 |
| commit | 27c23229c4d22d4f477cb8665725ec681e70666a (patch) | |
| tree | 7a11db6df7ebb8906a68ce1e53be360b8df9c5fd /view/jot-header.tpl | |
| parent | 3116db1a74657f1f9f87ef91181104819d01fd95 (diff) | |
| parent | 9434b447f3302a7f3223fb01f3c71378b8764e92 (diff) | |
| download | volse-hubzilla-27c23229c4d22d4f477cb8665725ec681e70666a.tar.gz volse-hubzilla-27c23229c4d22d4f477cb8665725ec681e70666a.tar.bz2 volse-hubzilla-27c23229c4d22d4f477cb8665725ec681e70666a.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'view/jot-header.tpl')
| -rw-r--r-- | 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 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) { |