diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-04-09 12:16:42 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-04-09 12:16:42 +0200 |
| commit | e2b4d33627d5f4cf5f68eb087059d86c78eec41e (patch) | |
| tree | 328313432c53b1a6c146595b91f4883ef5c33131 /view | |
| parent | 7690dca67b6574cd5b6ffcc59b1c8c6b2df5d54e (diff) | |
| download | volse-hubzilla-e2b4d33627d5f4cf5f68eb087059d86c78eec41e.tar.gz volse-hubzilla-e2b4d33627d5f4cf5f68eb087059d86c78eec41e.tar.bz2 volse-hubzilla-e2b4d33627d5f4cf5f68eb087059d86c78eec41e.zip | |
some work on comanche autocomplete
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/autocomplete.js | 9 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 3 |
4 files changed, 18 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 0ba291004..a4a1fdf51 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -269,7 +269,14 @@ function string2bb(element) { } if(type=='comanche') { - var open_close_elements = ['region', 'widget', 'var', 'template', 'css', 'js']; + var open_close_elements = ['region', 'layout', 'template', 'theme', 'widget', 'block', 'menu', 'var', 'css', 'js', 'authored', 'comment', 'webpage']; + var open_elements = []; + + var elements = open_close_elements.concat(open_elements); + } + + if(type=='comanche-block') { + var open_close_elements = ['menu', 'var']; var open_elements = []; var elements = open_close_elements.concat(open_elements); 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, diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index dea75efa9..026c586a0 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -48,6 +48,7 @@ {{/if}} <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> + {{if $bbcode}} <div class="btn-group"> <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> <i class="icon-bold jot-icons"></i> @@ -65,6 +66,7 @@ <i class="icon-terminal jot-icons"></i> </button> </div> + {{/if}} {{if $visitor}} <div class="btn-group hidden-xs"> {{if $writefiles}} diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index af8e37602..3e1f5a3fc 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -18,4 +18,7 @@ <input type="submit" name="submit" value="{{$submit}}" /> </form> +<script> + $('textarea').bbco_autocomplete('comanche'); +</script> </div> |