aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/autocomplete.js
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-30 15:02:45 -0700
committerredmatrix <git@macgirvin.com>2016-04-30 15:02:45 -0700
commit84d93cca6e2ac0b552a6f5c570fbcfce766200a1 (patch)
treea8a9c46ee6f70dd4b8824499a49b1e39e2980dc6 /view/js/autocomplete.js
parent45512e6aba602604143e946cca49c363ae88aa1e (diff)
parent9446d0cbb463af6a256efebf97e10618469f1193 (diff)
downloadvolse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.gz
volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.bz2
volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/js/autocomplete.js')
-rw-r--r--view/js/autocomplete.js6
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') {