diff options
author | friendica <info@friendica.com> | 2012-05-06 23:07:41 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-05-06 23:07:41 -0700 |
commit | c7f3e626d0bb141be86a8af6ffbe40768bc23069 (patch) | |
tree | 0f4020d6b86c65cc317739b8e562ea50801ec277 /view/theme/dispy/jot-header.tpl | |
parent | 8c2664083531daba2ad3cf3f77a4d9c968314e63 (diff) | |
parent | fb05cd6f1852e29c9a8d2595984f2aebfac0c1d2 (diff) | |
download | volse-hubzilla-c7f3e626d0bb141be86a8af6ffbe40768bc23069.tar.gz volse-hubzilla-c7f3e626d0bb141be86a8af6ffbe40768bc23069.tar.bz2 volse-hubzilla-c7f3e626d0bb141be86a8af6ffbe40768bc23069.zip |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
-rw-r--r-- | view/theme/dispy/jot-header.tpl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index ab15f9516..dabe8bb3d 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -24,8 +24,8 @@ function initEditor(cb) { mode : "specific_textareas", editor_selector: $editselect, auto_focus: "profile-jot-text", - plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen", + plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups,contextmenu,style", + theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen,charmap", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", @@ -98,7 +98,6 @@ function initEditor(cb) { $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); - } }); editor = true; @@ -155,8 +154,6 @@ function enableOnUser(){ } } ); - - }); function deleteCheckedItems() { @@ -345,5 +342,4 @@ function enableOnUser(){ }); $('#profile-jot-text').keyup(); } - </script> |