using jquery 1.7, latest jquery ui, and fixed dragging bug (issue 1168)

Artforge · Nov 20, 2011 · 56ae9f1 · 56ae9f1
1 parent 477c296
commit 56ae9f1
Show file tree

Hide file tree

Showing 6 changed files with 165 additions and 165 deletions.
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.min.js b/lib/jquery-1.7.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.16.custom.min.js b/lib/jquery-ui-1.8.16.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.min.js';
+var JQUERY_UI = 'jquery-ui-1.8.16.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);
 		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,11 @@ function HoverListener(coordinateGrid) {
 
 
 }
+
+
+function _fixUIEvent(event) { // jQuery 1.7 workaround (for issue 1168)
+	if (event.pageX === undefined) {
+		event.pageX = event.originalEvent.pageX;
+		event.pageY = event.originalEvent.pageY;
+	}
+}