Resolve #179 (#180)

fix calendar shifting date

Author: MikhailTymchukDX

AjaxControlToolkit.Jasmine/Suites/CalendarTests.aspx

@@ -446,6 +446,19 @@
                     expect(this.selectedDateExtender._selectedDate.localeFormat(this.selectedDateExtender._format)).toBe(this.selectedDateExtender._textbox.get_Value());
                 });
             });
+
+            describe("Parsing", function () {
+                beforeEach(function () {
+                    this.extender = $find(CALENDAR_EXTENDER_CLIENT_ID);
+                });
+
+                it("parses date correctly", function () {
+                    var date = this.extender._parseDateSortableFormat("2016-07-25T13:08:55");
+                    var expectedDate = new Date(2016, 6, 25, 13, 8, 55);
+                    
+                    expect(date.getTime()).toBe(expectedDate.getTime());
+                });
+            });
         });
     </script>
 

AjaxControlToolkit/Scripts/Calendar.js

@@ -324,7 +324,7 @@ Sys.Extended.UI.CalendarBehavior.prototype = {
     },
     set_selectedDate: function(value) {
         if(value && (String.isInstanceOfType(value)) && (value.length != 0)) {
-            value = Date.fromISO(value);
+            value = this._parseDateSortableFormat(value);
         }
 
         if(this._selectedDate != value) {
@@ -1753,6 +1753,17 @@ Sys.Extended.UI.CalendarBehavior.prototype = {
         }
         // make sure we clean up the flag due to issues with alert/alt-tab/etc
         this._popupMouseDown = false;
+    },
+    _parseDateSortableFormat: function (dateString) {
+        var dateParts = /(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.?(\d{0,7})?/.exec(dateString);
+
+        return new Date(
+            dateParts[1],
+            dateParts[2] - 1,
+            dateParts[3],
+            dateParts[4],
+            dateParts[5],
+            dateParts[6]);
     }
 }
 Sys.Extended.UI.CalendarBehavior.registerClass("Sys.Extended.UI.CalendarBehavior", Sys.Extended.UI.BehaviorBase);

AjaxControlToolkit/Scripts/Calendar.min.js

@@ -299,37 +299,4 @@ Sys.Extended.UI.FirstDayOfWeek.prototype = {
     Saturday : 6,
     Default : 7
 }
-Sys.Extended.UI.FirstDayOfWeek.registerEnum("Sys.Extended.UI.FirstDayOfWeek");
-
-(function(){
-    var D= new Date('2011-06-02T09:34:29+02:00');
-    if(!D || +D!== 1307000069000){
-        Date.fromISO= function(s){
-            var day, tz,
-            rx=/^(\d{4}\-\d\d\-\d\d([tT ][\d:\.]*)?)([zZ]|([+\-])(\d\d):(\d\d))?$/,
-            p= rx.exec(s) || [];
-            if(p[1]){
-                day= p[1].split(/\D/);
-                for(var i= 0, L= day.length; i<L; i++){
-                    day[i]= parseInt(day[i], 10) || 0;
-                };
-                day[1]-= 1;
-                day= new Date(Date.UTC.apply(Date, day));
-                if(!day.getDate()) return NaN;
-                if(p[5]){
-                    tz= (parseInt(p[5], 10)*60);
-                    if(p[6]) tz+= parseInt(p[6], 10);
-                    if(p[4]== '+') tz*= -1;
-                    if(tz) day.setUTCMinutes(day.getUTCMinutes()+ tz);
-                }
-                return day;
-            }
-            return NaN;
-        }
-    }
-    else{
-        Date.fromISO= function(s){
-            return new Date(s);
-        }
-    }
-})()
+Sys.Extended.UI.FirstDayOfWeek.registerEnum("Sys.Extended.UI.FirstDayOfWeek");