fix bug in calendar after pull-request 785

olton · Sep 17, 2015 · 58df88c · 58df88c
1 parent 294ea82
commit 58df88c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 3.0.12
 * add color schemes for calendar
+* fix bug in calendar after pull-request 785  
 
 ## 3.0.11
 * add keypad onChange event

diff --git a/build/js/metro.js b/build/js/metro.js
@@ -2425,7 +2425,7 @@ $.widget("metro.calendar", {
         var totalDays = ["31", "" + feb + "", "31", "30", "31", "30", "31", "31", "30", "31", "30", "31"];
         var daysInMonth = totalDays[month];
 
-        var first_week_day = this._dateFromNumbers(year, month, 1).getDay();
+        var first_week_day = this._dateFromNumbers(year, month + 1, 1).getDay();
 
         var table, tr, td, i, div;
 
@@ -2497,7 +2497,7 @@ $.widget("metro.calendar", {
             td = $("<div/>").addClass("calendar-cell align-center day");
             div = $("<div/>").appendTo(td);
 
-            if (o.minDate !== false && (this._dateFromNumbers(year, month, i) < o.minDate) || o.maxDate !== false && (this._dateFromNumbers(year, month, i) > o.maxDate)) {
+            if (o.minDate !== false && (this._dateFromNumbers(year, month + 1, i) < o.minDate) || o.maxDate !== false && (this._dateFromNumbers(year, month + 1, i) > o.maxDate)) {
                 td.removeClass("day");
                 div.addClass("other-day");
                 d_html = i;

diff --git a/build/js/metro.min.js b/build/js/metro.min.js
diff --git a/docs/js/metro.js b/docs/js/metro.js
@@ -2425,7 +2425,7 @@ $.widget("metro.calendar", {
         var totalDays = ["31", "" + feb + "", "31", "30", "31", "30", "31", "31", "30", "31", "30", "31"];
         var daysInMonth = totalDays[month];
 
-        var first_week_day = this._dateFromNumbers(year, month, 1).getDay();
+        var first_week_day = this._dateFromNumbers(year, month + 1, 1).getDay();
 
         var table, tr, td, i, div;
 
@@ -2497,7 +2497,7 @@ $.widget("metro.calendar", {
             td = $("<div/>").addClass("calendar-cell align-center day");
             div = $("<div/>").appendTo(td);
 
-            if (o.minDate !== false && (this._dateFromNumbers(year, month, i) < o.minDate) || o.maxDate !== false && (this._dateFromNumbers(year, month, i) > o.maxDate)) {
+            if (o.minDate !== false && (this._dateFromNumbers(year, month + 1, i) < o.minDate) || o.maxDate !== false && (this._dateFromNumbers(year, month + 1, i) > o.maxDate)) {
                 td.removeClass("day");
                 div.addClass("other-day");
                 d_html = i;

diff --git a/js/widgets/calendar.js b/js/widgets/calendar.js
@@ -150,7 +150,7 @@ $.widget("metro.calendar", {
         var totalDays = ["31", "" + feb + "", "31", "30", "31", "30", "31", "31", "30", "31", "30", "31"];
         var daysInMonth = totalDays[month];
 
-        var first_week_day = this._dateFromNumbers(year, month, 1).getDay();
+        var first_week_day = this._dateFromNumbers(year, month + 1, 1).getDay();
 
         var table, tr, td, i, div;
 
@@ -222,7 +222,7 @@ $.widget("metro.calendar", {
             td = $("<div/>").addClass("calendar-cell align-center day");
             div = $("<div/>").appendTo(td);
 
-            if (o.minDate !== false && (this._dateFromNumbers(year, month, i) < o.minDate) || o.maxDate !== false && (this._dateFromNumbers(year, month, i) > o.maxDate)) {
+            if (o.minDate !== false && (this._dateFromNumbers(year, month + 1, i) < o.minDate) || o.maxDate !== false && (this._dateFromNumbers(year, month + 1, i) > o.maxDate)) {
                 td.removeClass("day");
                 div.addClass("other-day");
                 d_html = i;