diff options
author | redmatrix <git@macgirvin.com> | 2016-04-05 12:51:22 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-04-05 12:51:22 -0700 |
commit | a7d5bf6854d207b4cb976a3f7773caf5a4c89801 (patch) | |
tree | 114d6cb852543340bee555d0bc447db8d0bf776f /view/js | |
parent | 0e7a963173833c1c63fae750cc8b1c3a9bf12f54 (diff) | |
parent | bd29551f9aec4c463c02a3c57a5d6d94c9ee318d (diff) | |
download | volse-hubzilla-a7d5bf6854d207b4cb976a3f7773caf5a4c89801.tar.gz volse-hubzilla-a7d5bf6854d207b4cb976a3f7773caf5a4c89801.tar.bz2 volse-hubzilla-a7d5bf6854d207b4cb976a3f7773caf5a4c89801.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/js')
-rw-r--r-- | view/js/autocomplete.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index b6e81eb8c..b4879d464 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -202,14 +202,17 @@ function submit_form(e) { $.fn.bbco_autocomplete = function(type) { if(type=='bbcode') { - var open_close_elements = ['b', 'i', 'u', 's', 'quote', 'code', 'spoiler', 'map', 'observer']; - var open_elements = ['observer.photo', 'observer.name', 'observer.url']; + var open_close_elements = ['b', 'i', 'u', 's', 'quote', 'code', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer']; + var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; var elements = open_close_elements.concat(open_elements); } if(type=='comanche') { - var elements = ['region', 'widget', 'var', 'template', 'css', 'js']; + var open_close_elements = ['region', 'widget', 'var', 'template', 'css', 'js']; + var open_elements = []; + + var elements = open_close_elements.concat(open_elements); } bbco = { |