From d2c42700fa7f2e45d8af8aed1cd9be4a2082d9f4 Mon Sep 17 00:00:00 2001
From: UndefinedOffset <echipman@webbuildersgroup.com>
Date: Fri, 7 Mar 2014 15:57:50 -0400
Subject: [PATCH 1/2] Fixed issue caused if jquery is in no-conflict mode (aka
$ is unbound)
---
javascript/lang/calendar_en.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/javascript/lang/calendar_en.js b/javascript/lang/calendar_en.js
index a249c69..3ae35fc 100755
--- 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']
-})
\ No newline at end of file
+ })
+})(jQuery);
\ No newline at end of file
From 83cb7ea2f1d4e240e63a4e01e69ff1456430e440 Mon Sep 17 00:00:00 2001
From: UndefinedOffset <echipman@webbuildersgroup.com>
Date: Fri, 7 Mar 2014 15:58:33 -0400
Subject: [PATCH 2/2] Fixed issue #36 and issue #24 where the number of rows in
the calendar widget could be wrong
---
javascript/calendar_widget.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/javascript/calendar_widget.js b/javascript/calendar_widget.js
index 85febf6..a421260 100755
--- 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 = "";