Upgraded to the latest Fullcalendar version 1.5.3

arenoir · Jun 2, 2012 · 3a1e185 · 3a1e185
1 parent 341d661
commit 3a1e185
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 167 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 
+version 1.5.3 (2/6/12)
+	- fixed dragging issue with jQuery UI 1.8.16 (issue 1168)
+	- bundled with jQuery 1.7.1 and jQuery UI 1.8.17
+
 version 1.5.2 (8/21/11)
 	- correctly process UTC "Z" ISO8601 date strings (issue 750)
 

diff --git a/demos/resourceView.html b/demos/resourceView.html
@@ -22,7 +22,7 @@
 			header: {
 				left: 'prev,next today',
 				center: 'title',
-				right: 'resourceDay,resourceWeek,resourceMonth'
+				right: 'resourceDay,resourceWeek,resourceNextWeeks,resourceMonth'
 			},
 			defaultView: 'resourceDay',
 			firstDay: 1, 	

diff --git a/lib/jquery-1.5.2.min.js b/lib/jquery-1.5.2.min.js
diff --git a/lib/jquery-1.7.1.min.js b/lib/jquery-1.7.1.min.js
diff --git a/lib/jquery-ui-1.8.11.custom.min.js b/lib/jquery-ui-1.8.11.custom.min.js
diff --git a/lib/jquery-ui-1.8.17.custom.min.js b/lib/jquery-ui-1.8.17.custom.min.js
diff --git a/src/_loader.js b/src/_loader.js
@@ -1,7 +1,7 @@
 (function() {
 
-var JQUERY = 'jquery-1.5.2.min.js';
-var JQUERY_UI = 'jquery-ui-1.8.11.custom.min.js';
+var JQUERY = 'jquery-1.7.1.min.js';
+var JQUERY_UI = 'jquery-ui-1.8.17.custom.min.js';
 var JQUERY_LEGACY = 'jquery-1.3.2.min.js';
 var JQUERY_UI_LEGACY = 'jquery-ui-1.7.3.custom.min.js';
 

diff --git a/src/common/HoverListener.js b/src/common/HoverListener.js
@@ -20,6 +20,7 @@ function HoverListener(coordinateGrid) {
 
 
 	function mouse(ev) {
+		_fixUIEvent(ev); // see below
 		var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
 		if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
 			if (newCell) {
@@ -42,3 +43,17 @@ function HoverListener(coordinateGrid) {
 
 
 }
+
+
+
+// this fix was only necessary for jQuery UI 1.8.16 (and jQuery 1.7 or 1.7.1)
+// upgrading to jQuery UI 1.8.17 (and using either jQuery 1.7 or 1.7.1) fixed the problem
+// but keep this in here for 1.8.16 users
+// and maybe remove it down the line
+
+function _fixUIEvent(event) { // for issue 1168
+	if (event.pageX === undefined) {
+		event.pageX = event.originalEvent.pageX;
+		event.pageY = event.originalEvent.pageY;
+	}
+}
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.5.2
+1.5.3