Fix multiple values and default options

matrozov · May 2, 2017 · 479d069 · 479d069
1 parent 1e58b5a
commit 479d069
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 69 deletions.
diff --git a/dist/js/selectopus.full.js b/dist/js/selectopus.full.js
@@ -101,27 +101,6 @@
                     values: []
                 };
 
-                self.$element.find('option').each(function() {
-                    var $option = $(this);
-
-                    var value = $option.prop('value');
-
-                    if (typeof(value) === 'undefined') {
-                        value = $option.text();
-                    }
-
-                    result.items[value] = $option.text();
-
-                    if ($option.prop('selected')) {
-                        if (result.multiple) {
-                            result.values.push(value);
-                        }
-                        else {
-                            result.values = [value];
-                        }
-                    }
-                });
-
                 var language = $element.attr('lang');
 
                 if (self.language.exists(language)) {
@@ -175,6 +154,27 @@
                     }
                 });
 
+                self.$element.find('option').each(function() {
+                    var $option = $(this);
+
+                    var value = $option.prop('value');
+
+                    if (typeof(value) === 'undefined') {
+                        value = $option.text();
+                    }
+
+                    result.items[value] = $option.text();
+
+                    if ($option.prop('selected')) {
+                        if (result.multiple) {
+                            result.values.push(value);
+                        }
+                        else {
+                            result.values = [value];
+                        }
+                    }
+                });
+
                 return result;
             },
 
@@ -718,7 +718,7 @@
 
         required: false, // Allow empty value
         multiple: false, // Allow multiple select
-        allowCreate: true, // Allow create new value
+        allowCreate: false, // Allow create new value
 
         popupHideSelected: false, // Hide selected items (or only hightlite by default)
 

diff --git a/dist/js/selectopus.full.min.js b/dist/js/selectopus.full.min.js
diff --git a/dist/js/selectopus.js b/dist/js/selectopus.js
@@ -101,27 +101,6 @@
                     values: []
                 };
 
-                self.$element.find('option').each(function() {
-                    var $option = $(this);
-
-                    var value = $option.prop('value');
-
-                    if (typeof(value) === 'undefined') {
-                        value = $option.text();
-                    }
-
-                    result.items[value] = $option.text();
-
-                    if ($option.prop('selected')) {
-                        if (result.multiple) {
-                            result.values.push(value);
-                        }
-                        else {
-                            result.values = [value];
-                        }
-                    }
-                });
-
                 var language = $element.attr('lang');
 
                 if (self.language.exists(language)) {
@@ -175,6 +154,27 @@
                     }
                 });
 
+                self.$element.find('option').each(function() {
+                    var $option = $(this);
+
+                    var value = $option.prop('value');
+
+                    if (typeof(value) === 'undefined') {
+                        value = $option.text();
+                    }
+
+                    result.items[value] = $option.text();
+
+                    if ($option.prop('selected')) {
+                        if (result.multiple) {
+                            result.values.push(value);
+                        }
+                        else {
+                            result.values = [value];
+                        }
+                    }
+                });
+
                 return result;
             },
 
@@ -718,7 +718,7 @@
 
         required: false, // Allow empty value
         multiple: false, // Allow multiple select
-        allowCreate: true, // Allow create new value
+        allowCreate: false, // Allow create new value
 
         popupHideSelected: false, // Hide selected items (or only hightlite by default)