diff options
| author | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-21 15:24:09 -0800 |
|---|---|---|
| committer | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-21 15:24:09 -0800 |
| commit | 1d65bc6382ce6a474411e73b72a5c4d155a5ebb2 (patch) | |
| tree | 828db28446468762140c8e10fd963c55b358048d | |
| parent | b513662b52576a5507d2280efd684e13ffd31fb5 (diff) | |
| parent | 8794106e85f8d2486d636fd37605fb3408c73ee0 (diff) | |
| download | volse-hubzilla-1d65bc6382ce6a474411e73b72a5c4d155a5ebb2.tar.gz volse-hubzilla-1d65bc6382ce6a474411e73b72a5c4d155a5ebb2.tar.bz2 volse-hubzilla-1d65bc6382ce6a474411e73b72a5c4d155a5ebb2.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | view/js/autocomplete.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 62fc37420..5a616b6fc 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -270,7 +270,7 @@ function string2bb(element) { $.fn.bbco_autocomplete = function(type) { if(type=='bbcode') { - var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'embed', 'highlight']; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight']; var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; var elements = open_close_elements.concat(open_elements); @@ -309,6 +309,10 @@ function string2bb(element) { return ['\[' + element + '\]' + '\n\[*=Item name\] ', '\n\[/' + element + '\]']; } else if(element === 'table') { return ['\[' + element + '\]' + '\n\[tr\]', '\[/tr\]\n\[/' + element + '\]']; + } else if(element === 'observer') { + return ['\[' + element + '=1\]', '\[/observer\]']; + } else if(element === 'observer.language') { + return ['\[' + element + '=en\]', '\[/observer\]']; } else { return ['\[' + element + '\]', '\[/' + element + '\]']; |