Sync with Kendo UI Professional

Author: User Jenkins

src/kendo.datepicker.js

@@ -541,8 +541,12 @@ var __meta__ = { // jshint ignore:line
 
             that._old = that._update(value);
 
-            if (that._old === null && !that._dateInput) {
-                that.element.val("");
+            if (that._old === null) {
+                if (that._dateInput) {
+                    that._dateInput.value(that._old);
+                } else {
+                    that.element.val("");
+                }
             }
 
             that._oldText = that.element.val();

src/kendo.datetimepicker.js

@@ -444,7 +444,11 @@ var __meta__ = { // jshint ignore:line
 
             that._old = that._update(value);
             if (that._old === null) {
-                that.element.val("");
+                if (that._dateInput) {
+                    that._dateInput.value(that._old);
+                } else {
+                    that.element.val("");
+                }
             }
 
             that._oldText = that.element.val();
@@ -624,8 +628,10 @@ var __meta__ = { // jshint ignore:line
                     timeView.bind();
                 }
             }
-            if (that._dateInput && date) {
-                that._dateInput.value(date || value);
+            if (that._dateInput) {
+                if (date) {
+                    that._dateInput.value(date);
+                }
             } else {
                 that.element.val(kendo.toString(date || value, options.format, options.culture));
             }

tests/datepicker/api.js

@@ -211,6 +211,16 @@ it("empty input if set value ot null", function() {
     assert.equal(datepicker._value, null);
 });
 
+it("mask is shown if set value ot null", function() {
+    datepicker = input.kendoDatePicker({ dateInput: true }).data("kendoDatePicker");
+
+    datepicker.value(null);
+
+    assert.isOk(input.val());
+    assert.equal(input.val(), "month/day/year");
+    assert.equal(datepicker._value, null);
+});
+
 it("value method should call dateview.value()", function() {
     datepicker = input.kendoDatePicker().data("kendoDatePicker");
     stub(datepicker.dateView, "value");

tests/datetimepicker/api.js

@@ -125,6 +125,24 @@
             assert.equal(+datetimepicker.value(), +value);
         });
 
+        it("value method should not clear DateInput format", function() {
+            var datetimepicker = new DateTimePicker(input, {
+                dateInput: true
+            });
+            datetimepicker.value(null);
+            assert.isOk(datetimepicker.element.val());
+        })
+
+        it("value method should not clear DateInput format if initial value was provided", function() {
+            var datetimepicker = new DateTimePicker(input, {
+                dateInput: true,
+                value: new Date()
+            });
+            datetimepicker.value(null);
+            assert.equal(datetimepicker.element.val(), "month/day/year hours:minutes AM/PM");
+            assert.isOk(datetimepicker.element.val());
+        })
+
         it("value method sets null if date is out of range", function() {
             var datetimepicker = new DateTimePicker(input, {
                 min: new Date(2000, 10, 10)