Merge pull request #38 from webbuilders-group/master

Fix for issue #36 and issue #24 where rows in the calendar widget could be wrong
unclecheese · Mar 8, 2014 · f72a19b · f72a19b
2 parents 2399891 + 83cb7ea
commit f72a19b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/javascript/calendar_widget.js b/javascript/calendar_widget.js
@@ -162,7 +162,7 @@
 
 			var cell = 1;
 			var empties = 0;
-			var row_count = Math.ceil(this.monthLength/7);
+			var row_count = Math.ceil((this.startingDay+this.monthLength)/7);
 			for (var i = 0; i < row_count; i++) {
 				for (var j = 0; j <= 6; j++) {
 					date = "";

diff --git a/javascript/lang/calendar_en.js b/javascript/lang/calendar_en.js
@@ -1,6 +1,8 @@
-$.CalendarWidget.setOptions({
-	startOnMonday: false,
-	calDaysLabels: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-	calMonthsLabels: ['January', 'February', 'March', 'April','May', 'June', 'July', 'August', 'September','October', 'November', 'December']
+(function($) {
+    $.CalendarWidget.setOptions({
+        startOnMonday: false,
+        calDaysLabels: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+        calMonthsLabels: ['January', 'February', 'March', 'April','May', 'June', 'July', 'August', 'September','October', 'November', 'December']
 
-})
+    })
+})(jQuery);