|
@@ -1,4 +1,4 @@
|
|
-/*
|
|
|
|
|
|
+/*
|
|
Copyright 2012 Igor Vaynberg
|
|
Copyright 2012 Igor Vaynberg
|
|
|
|
|
|
Version: @@ver@@ Timestamp: @@timestamp@@
|
|
Version: @@ver@@ Timestamp: @@timestamp@@
|
|
@@ -2057,7 +2057,8 @@ the specific language governing permissions and limitations under the Apache Lic
|
|
|
|
|
|
isPlaceholderOptionSelected: function() {
|
|
isPlaceholderOptionSelected: function() {
|
|
var placeholderOption;
|
|
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() === "") ||
|
|
(this.opts.element.val() === undefined) ||
|
|
(this.opts.element.val() === undefined) ||
|
|
(this.opts.element.val() === null);
|
|
(this.opts.element.val() === null);
|