diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-04-30 22:30:37 +0200 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-04-30 22:30:37 +0200 |
| commit | 3d9fcee075802d8090a394e458e6bc7faba4af18 (patch) | |
| tree | 850337863d3c84761e87357d6a13d7c43a7e63a9 /view/js | |
| parent | 917bcb55fd3beee4eb8590256a458872b9da7605 (diff) | |
| parent | 026787fc73cb76975b55425cdec9b6701a097935 (diff) | |
| download | volse-hubzilla-3d9fcee075802d8090a394e458e6bc7faba4af18.tar.gz volse-hubzilla-3d9fcee075802d8090a394e458e6bc7faba4af18.tar.bz2 volse-hubzilla-3d9fcee075802d8090a394e458e6bc7faba4af18.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/autocomplete.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 21ce2d150..41077d427 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -103,7 +103,7 @@ function submit_form(e) { function getWord(text, caretPos) { var index = text.indexOf(caretPos); var postText = text.substring(caretPos, caretPos+8); - if ((postText.indexOf("[/list]") > 0) || postText.indexOf("[/ul]") > 0 || postText.indexOf("[/ol]") > 0) { + if ((postText.indexOf('[/list]') > 0) || postText.indexOf('[/ul]') > 0 || postText.indexOf('[/ol]') > 0 || postText.indexOf('[/dl]') > 0) { return postText; } } @@ -265,7 +265,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', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer']; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'dl', 'li', '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); @@ -296,7 +296,7 @@ function string2bb(element) { replace: function (element) { element = string2bb(element); if(open_elements.indexOf(element) < 0) { - if(element === 'list' || element === 'ol' || element === 'ul') { + if(element === 'list' || element === 'ol' || element === 'ul' || element === 'dl') { return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]']; } else if(element === 'table') { |