Merge remote-tracking branch 'upstream/develop' into reduce-update-contacts

[friendica.git] / view / js / autocomplete.js

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index c3993603b4bacf619238d8d740a382d277e18e8d..91dd0053f12e851455e35b539149563482d1b1dd 100644 (file)
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -202,16 +202,17 @@ function string2bb(element) {
        // jQuery wrapper for yuku/old-textcomplete
        // uses a local object directory to avoid recreating Textcomplete objects
        $.fn.textcomplete = function (strategies, options) {
-               if (!(this.data('textcompleteId') in textcompleteObjects)) {
-                       let editor = new Textcomplete.editors.Textarea(this.get(0));
+               return this.each(function () {
+                       let $this = $(this);
+                       if (!($this.data('textcompleteId') in textcompleteObjects)) {
+                               let editor = new Textcomplete.editors.Textarea($this.get(0));
 
-                       this.data('textcompleteId', textcompleteObjects.length);
-                       textcompleteObjects.push(new Textcomplete(editor, options));
-               }
-
-               textcompleteObjects[this.data('textcompleteId')].register(strategies);
+                               $this.data('textcompleteId', textcompleteObjects.length);
+                               textcompleteObjects.push(new Textcomplete(editor, options));
+                       }
 
-               return this;
+                       textcompleteObjects[$this.data('textcompleteId')].register(strategies);
+               });
        };
 
        /**
@@ -293,7 +294,7 @@ function string2bb(element) {
                };
 
                this.attr('autocomplete','off');
-               this.textcomplete([contacts, forums, smilies, tags], {className:'acpopup', zIndex:10000});
+               this.textcomplete([contacts, forums, smilies, tags], {dropdown: {className:'acpopup'}});
                this.fixTextcompleteEscape();
 
                return this;
@@ -328,7 +329,7 @@ function string2bb(element) {
                };
 
                this.attr('autocomplete', 'off');
-               this.textcomplete([contacts, community, tags], {className:'acpopup', maxCount:100, zIndex: 10000, appendTo:'nav'});
+               this.textcomplete([contacts, community, tags], {dropdown: {className:'acpopup', maxCount:100}});
                this.fixTextcompleteEscape();
                this.on('textComplete:select', function(e, value, strategy) { submit_form(this); });
 
@@ -349,7 +350,7 @@ function string2bb(element) {
                };
 
                this.attr('autocomplete','off');
-               this.textcomplete([names], {className:'acpopup', zIndex:10000});
+               this.textcomplete([names], {dropdown: {className:'acpopup'}});
                this.fixTextcompleteEscape();
 
                if(autosubmit) {
@@ -365,7 +366,7 @@ function string2bb(element) {
 
        $.fn.bbco_autocomplete = function(type) {
                if (type === 'bbcode') {
-                       var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract'];
+                       var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract', 'share'];
                        var open_elements = ['*', 'hr'];
 
                        var elements = open_close_elements.concat(open_elements);
@@ -399,7 +400,7 @@ function string2bb(element) {
                };
 
                this.attr('autocomplete','off');
-               this.textcomplete([bbco], {className:'acpopup', zIndex:10000});
+               this.textcomplete([bbco], {dropdown: {className:'acpopup'}});
                this.fixTextcompleteEscape();
 
                this.on('textComplete:select', function(e, value, strategy) { value; });