Merge pull request #12891 from annando/system-variables

[friendica.git] / view / js / friendica-tagsinput / friendica-tagsinput.js

diff --git a/view/js/friendica-tagsinput/friendica-tagsinput.js b/view/js/friendica-tagsinput/friendica-tagsinput.js
index af722d789ee04c39de7b46086fb152bc666b54e4..45c00641fdb65bd672925969477a09b87e114045 100644 (file)
--- a/view/js/friendica-tagsinput/friendica-tagsinput.js
+++ b/view/js/friendica-tagsinput/friendica-tagsinput.js
@@ -165,7 +165,7 @@
 
       // add <option /> if item represents a value not present in one of the <select />'s options
       if (self.isSelect && !optionExists) {
-        var $option = $('<option selected>' + htmlEncode(itemText) + '</option>');
+        var $option = $('<option>' + htmlEncode(itemText) + '</option>');
         $option.data('item', item);
         $option.attr('value', itemValue);
         self.$element.append($option);
@@ -574,29 +574,24 @@
       var tagsinput = $(this).data('tagsinput');
       // Initialize a new tags input
       if (!tagsinput) {
-          tagsinput = new TagsInput(this, arg1);
-          $(this).data('tagsinput', tagsinput);
-          results.push(tagsinput);
-
-          if (this.tagName === 'SELECT') {
-              $('option', $(this)).attr('selected', 'selected');
-          }
-
-          // Init tags from $(this).val()
-          $(this).val($(this).val());
+        tagsinput = new TagsInput(this, arg1);
+        $(this).data('tagsinput', tagsinput);
+        results.push(tagsinput);
+        // Init tags from $(this).val()
+        $(this).val($(this).val());
       } else if (!arg1 && !arg2) {
-          // tagsinput already exists
-          // no function, trying to init
-          results.push(tagsinput);
+        // tagsinput already exists
+        // no function, trying to init
+        results.push(tagsinput);
       } else if(tagsinput[arg1] !== undefined) {
-          // Invoke function on existing tags input
-            if(tagsinput[arg1].length === 3 && arg3 !== undefined){
-               var retVal = tagsinput[arg1](arg2, null, arg3);
-            }else{
-               var retVal = tagsinput[arg1](arg2);
-            }
-          if (retVal !== undefined)
-              results.push(retVal);
+        // Invoke function on existing tags input
+        if(tagsinput[arg1].length === 3 && arg3 !== undefined){
+          var retVal = tagsinput[arg1](arg2, null, arg3);
+        }else{
+          var retVal = tagsinput[arg1](arg2);
+        }
+        if (retVal !== undefined)
+          results.push(retVal);
       }
     });