diff options
| author | zottel <github@zottel.net> | 2012-05-07 09:11:45 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-07 09:11:45 +0200 |
| commit | a2ea560bf397902ce5608daabf101d0bcf813f13 (patch) | |
| tree | 0f4020d6b86c65cc317739b8e562ea50801ec277 /view/theme/dispy/jot-header.tpl | |
| parent | 3cd428152d8727b838565c462f91accd35204ce1 (diff) | |
| parent | c7f3e626d0bb141be86a8af6ffbe40768bc23069 (diff) | |
| download | volse-hubzilla-a2ea560bf397902ce5608daabf101d0bcf813f13.tar.gz volse-hubzilla-a2ea560bf397902ce5608daabf101d0bcf813f13.tar.bz2 volse-hubzilla-a2ea560bf397902ce5608daabf101d0bcf813f13.zip | |
Merge remote branch 'upstream/master'
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> |