diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
| commit | e9f1bac062bc72f118c7633cf683b21a000d089e (patch) | |
| tree | f26c59e6399deb278b1659534d7c6ea75a397b95 /view/tpl/jot-header.tpl | |
| parent | abfbe9c9375c7505e0422b8adc1d9d5426d7df1a (diff) | |
| parent | 46ed79c87a23f442eadc4244b62a6f85f3d431e8 (diff) | |
| download | volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.gz volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.bz2 volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl/jot-header.tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 2b62f2407..769923a51 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -11,11 +11,15 @@ function initEditor(cb){ if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); - $("#profile-jot-text").bbco_autocomplete('bbcode'); // autocomplete bbcode + {{if $bbco_autocomplete}} + $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode + {{/if}} + {{if $editor_autocomplete}} if(typeof channelId === 'undefined') $("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); else $("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections + {{/if}} editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, |