aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/jot-header.tpl
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-04-19 09:55:36 -0700
committerSimon <simon@kisikew.org>2012-04-19 09:55:36 -0700
commit51967edfe8f7200ae42c903efb0d2ca6d1d6bc0a (patch)
treec4848cf3fc53d291f02b796df2256ba116c8a269 /view/theme/dispy/jot-header.tpl
parent44f4b4b9d1bd28a8c77e9f851e85fdb22c8fd8b1 (diff)
parent4fd1a17f0662d089d2d729aabdf04a883464ab05 (diff)
downloadvolse-hubzilla-51967edfe8f7200ae42c903efb0d2ca6d1d6bc0a.tar.gz
volse-hubzilla-51967edfe8f7200ae42c903efb0d2ca6d1d6bc0a.tar.bz2
volse-hubzilla-51967edfe8f7200ae42c903efb0d2ca6d1d6bc0a.zip
Merge pull request #250 from simonlnu/master
tweak drop-down and add in filebrowser
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
-rw-r--r--view/theme/dispy/jot-header.tpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index c55ac503a..ab15f9516 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/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) {