Parcourir la source

fix options with empty values. fixes #1497

Igor Vaynberg il y a 12 ans
Parent
commit
1f09c7abaf
1 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. 3 2
      select2.js

+ 3 - 2
select2.js

@@ -1,4 +1,4 @@
-/*
+/*
 Copyright 2012 Igor Vaynberg
 
 Version: @@ver@@ Timestamp: @@timestamp@@
@@ -2057,7 +2057,8 @@ the specific language governing permissions and limitations under the Apache Lic
 
         isPlaceholderOptionSelected: function() {
             var placeholderOption;
-            return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.is(':selected')) ||
+            return this.opts.placeholder &&
+                ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.is(':selected')) ||
                    (this.opts.element.val() === "") ||
                    (this.opts.element.val() === undefined) ||
                    (this.opts.element.val() === null);