Fix #106: More correct validation for guessing date without ajax conv…

…ersion
kartik-v · Jan 8, 2017 · 4b0d4a8 · 4b0d4a8
1 parent cd750a2
commit 4b0d4a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -14,6 +14,7 @@ Change Log: `yii2-datecontrol`
    - `afterpaste.datecontrol`: will be triggered when a data is pasted in the date input on the client.   
 - (enh #96, #102): Ignore timezone conversion for `DateControl::FORMAT_DATE`.
 - (bug #105): Set date control plugin data correctly within widget options.
+- (bug #106): More correct validation for guessing date without ajax conversion.
 
 ## version 1.9.5
 

diff --git a/assets/js/datecontrol.js b/assets/js/datecontrol.js
@@ -62,7 +62,7 @@
             } else {
                 if (isEmpty(vUrl)) {
                     var vDispDate = vFormatter.parseDate($el.val(), vDispFormat);
-                    if (vDispDate === false) {
+                    if (vDispDate === false || vDispDate === null || String(vDispDate).length === 0) {
                         vDispDate = vFormatter.guessDate($el.val(), vDispFormat);
                         $el.val(vFormatter.formatDate(vDispDate, vDispFormat));
                     }

diff --git a/assets/js/datecontrol.min.js b/assets/js/datecontrol.min.js