From 7f7589e93972e49be03d35fe51f232e234f9e1ab Mon Sep 17 00:00:00 2001 From: thatcher Date: Tue, 13 Dec 2011 20:04:38 -0500 Subject: [PATCH] minor refactor of mousetracker.js --- openseadragon.js | 193 +++++++++++++++++++++----------------------- src/mousetracker.js | 193 +++++++++++++++++++++----------------------- 2 files changed, 188 insertions(+), 198 deletions(-) diff --git a/openseadragon.js b/openseadragon.js index fc7caaa9..0d1fc5f2 100644 --- a/openseadragon.js +++ b/openseadragon.js @@ -745,65 +745,19 @@ $.Utils = new $.Utils(); }( OpenSeadragon )); (function( $ ){ + //Ensures we dont break existing instances of mousetracker if we are dumb + //enough to load openseadragon.js onto the page twice. I don't know how + //useful this pattern is, but if we decide to use it we should use it + //everywhere if ($.MouseTracker) { return; } - - var isIE = $.Utils.getBrowser() == $.Browser.IE; - - - var buttonDownAny = false; - - var ieCapturingAny = false; - var ieTrackersActive = {}; // dictionary from hash to MouseTracker - var ieTrackersCapturing = []; // list of trackers interested in capture - - - function getMouseAbsolute(event) { - return $.Utils.getMousePosition(event); - } - - function getMouseRelative(event, elmt) { - var mouse = $.Utils.getMousePosition(event); - var offset = $.Utils.getElementPosition(elmt); - - return mouse.minus(offset); - } - - /** - * Returns true if elmtB is a child node of elmtA, or if they're equal. - */ - function isChild(elmtA, elmtB) { - var body = document.body; - while (elmtB && elmtA != elmtB && body != elmtB) { - try { - elmtB = elmtB.parentNode; - } catch (e) { - return false; - } - } - return elmtA == elmtB; - } - - function onGlobalMouseDown() { - buttonDownAny = true; - } - - function onGlobalMouseUp() { - buttonDownAny = false; - } - - - (function () { - if (isIE) { - $.Utils.addEvent(document, "mousedown", onGlobalMouseDown, false); - $.Utils.addEvent(document, "mouseup", onGlobalMouseUp, false); - } else { - $.Utils.addEvent(window, "mousedown", onGlobalMouseDown, true); - $.Utils.addEvent(window, "mouseup", onGlobalMouseUp, true); - } - })(); + var isIE = $.Utils.getBrowser() == $.Browser.IE, + buttonDownAny = false, + ieCapturingAny = false, + ieTrackersActive = {}, // dictionary from hash to MouseTracker + ieTrackersCapturing = []; // list of trackers interested in capture $.MouseTracker = function (elmt, clickTimeThreshold, clickDistThreshold) { @@ -812,34 +766,55 @@ $.Utils = new $.Utils(); // - of Viewers has less memory impact. Also use // - prototype pattern instead of Singleton pattern. //End Thatcher - var self = this; - var ieSelf = null; + var self = this, + ieSelf = null, - var hash = Math.random(); // a unique hash for this tracker - var elmt = $.Utils.getElement(elmt); + hash = Math.random(), // a unique hash for this tracker + elmt = $.Utils.getElement(elmt), - var tracking = false; - var capturing = false; - var buttonDownElmt = false; - var insideElmt = false; + tracking = false, + capturing = false, + buttonDownElmt = false, + insideElmt = false, - var lastPoint = null; // position of last mouse down/move - var lastMouseDownTime = null; // time of last mouse down - var lastMouseDownPoint = null; // position of last mouse down - var clickTimeThreshold = clickTimeThreshold; - var clickDistThreshold = clickDistThreshold; + lastPoint = null, // position of last mouse down/move + lastMouseDownTime = null, // time of last mouse down + lastMouseDownPoint = null, // position of last mouse down + clickTimeThreshold = clickTimeThreshold, + clickDistThreshold = clickDistThreshold; - this.target = elmt; - this.enterHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) - this.exitHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) - this.pressHandler = null; // function(tracker, position) + this.target = elmt; + this.enterHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) + this.exitHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) + this.pressHandler = null; // function(tracker, position) this.releaseHandler = null; // function(tracker, position, insideElmtPress, insideElmtRelease) - this.scrollHandler = null; // function(tracker, position, scroll, shift) - this.clickHandler = null; // function(tracker, position, quick, shift) - this.dragHandler = null; // function(tracker, position, delta, shift) + this.scrollHandler = null; // function(tracker, position, scroll, shift) + this.clickHandler = null; // function(tracker, position, quick, shift) + this.dragHandler = null; // function(tracker, position, delta, shift) + + (function () { + ieSelf = { + hasMouse: hasMouse, + onMouseOver: onMouseOver, + onMouseOut: onMouseOut, + onMouseUp: onMouseUp, + onMouseMove: onMouseMove + }; + })(); + this.isTracking = function () { + return tracking; + }; + + this.setTracking = function (track) { + if (track) { + startTracking(); + } else { + stopTracking(); + } + }; function startTracking() { if (!tracking) { @@ -1169,32 +1144,52 @@ $.Utils = new $.Utils(); $.Utils.stopEvent(event); } - - (function () { - ieSelf = { - hasMouse: hasMouse, - onMouseOver: onMouseOver, - onMouseOut: onMouseOut, - onMouseUp: onMouseUp, - onMouseMove: onMouseMove - }; - })(); - - - this.isTracking = function () { - return tracking; - }; - - this.setTracking = function (track) { - if (track) { - startTracking(); - } else { - stopTracking(); - } - }; - }; + function getMouseAbsolute( event ) { + return $.Utils.getMousePosition(event); + } + + function getMouseRelative( event, elmt ) { + var mouse = $.Utils.getMousePosition(event); + var offset = $.Utils.getElementPosition(elmt); + + return mouse.minus(offset); + } + + /** + * Returns true if elmtB is a child node of elmtA, or if they're equal. + */ + function isChild( elmtA, elmtB ) { + var body = document.body; + while (elmtB && elmtA != elmtB && body != elmtB) { + try { + elmtB = elmtB.parentNode; + } catch (e) { + return false; + } + } + return elmtA == elmtB; + } + + function onGlobalMouseDown() { + buttonDownAny = true; + } + + function onGlobalMouseUp() { + buttonDownAny = false; + } + + + (function () { + if (isIE) { + $.Utils.addEvent(document, "mousedown", onGlobalMouseDown, false); + $.Utils.addEvent(document, "mouseup", onGlobalMouseUp, false); + } else { + $.Utils.addEvent(window, "mousedown", onGlobalMouseDown, true); + $.Utils.addEvent(window, "mouseup", onGlobalMouseUp, true); + } + })(); }( OpenSeadragon )); diff --git a/src/mousetracker.js b/src/mousetracker.js index a2463ed4..dba27981 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -1,65 +1,19 @@ (function( $ ){ + //Ensures we dont break existing instances of mousetracker if we are dumb + //enough to load openseadragon.js onto the page twice. I don't know how + //useful this pattern is, but if we decide to use it we should use it + //everywhere if ($.MouseTracker) { return; } - - var isIE = $.Utils.getBrowser() == $.Browser.IE; - - - var buttonDownAny = false; - - var ieCapturingAny = false; - var ieTrackersActive = {}; // dictionary from hash to MouseTracker - var ieTrackersCapturing = []; // list of trackers interested in capture - - - function getMouseAbsolute(event) { - return $.Utils.getMousePosition(event); - } - - function getMouseRelative(event, elmt) { - var mouse = $.Utils.getMousePosition(event); - var offset = $.Utils.getElementPosition(elmt); - - return mouse.minus(offset); - } - - /** - * Returns true if elmtB is a child node of elmtA, or if they're equal. - */ - function isChild(elmtA, elmtB) { - var body = document.body; - while (elmtB && elmtA != elmtB && body != elmtB) { - try { - elmtB = elmtB.parentNode; - } catch (e) { - return false; - } - } - return elmtA == elmtB; - } - - function onGlobalMouseDown() { - buttonDownAny = true; - } - - function onGlobalMouseUp() { - buttonDownAny = false; - } - - - (function () { - if (isIE) { - $.Utils.addEvent(document, "mousedown", onGlobalMouseDown, false); - $.Utils.addEvent(document, "mouseup", onGlobalMouseUp, false); - } else { - $.Utils.addEvent(window, "mousedown", onGlobalMouseDown, true); - $.Utils.addEvent(window, "mouseup", onGlobalMouseUp, true); - } - })(); + var isIE = $.Utils.getBrowser() == $.Browser.IE, + buttonDownAny = false, + ieCapturingAny = false, + ieTrackersActive = {}, // dictionary from hash to MouseTracker + ieTrackersCapturing = []; // list of trackers interested in capture $.MouseTracker = function (elmt, clickTimeThreshold, clickDistThreshold) { @@ -68,34 +22,55 @@ // - of Viewers has less memory impact. Also use // - prototype pattern instead of Singleton pattern. //End Thatcher - var self = this; - var ieSelf = null; + var self = this, + ieSelf = null, - var hash = Math.random(); // a unique hash for this tracker - var elmt = $.Utils.getElement(elmt); + hash = Math.random(), // a unique hash for this tracker + elmt = $.Utils.getElement(elmt), - var tracking = false; - var capturing = false; - var buttonDownElmt = false; - var insideElmt = false; + tracking = false, + capturing = false, + buttonDownElmt = false, + insideElmt = false, - var lastPoint = null; // position of last mouse down/move - var lastMouseDownTime = null; // time of last mouse down - var lastMouseDownPoint = null; // position of last mouse down - var clickTimeThreshold = clickTimeThreshold; - var clickDistThreshold = clickDistThreshold; + lastPoint = null, // position of last mouse down/move + lastMouseDownTime = null, // time of last mouse down + lastMouseDownPoint = null, // position of last mouse down + clickTimeThreshold = clickTimeThreshold, + clickDistThreshold = clickDistThreshold; - this.target = elmt; - this.enterHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) - this.exitHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) - this.pressHandler = null; // function(tracker, position) + this.target = elmt; + this.enterHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) + this.exitHandler = null; // function(tracker, position, buttonDownElmt, buttonDownAny) + this.pressHandler = null; // function(tracker, position) this.releaseHandler = null; // function(tracker, position, insideElmtPress, insideElmtRelease) - this.scrollHandler = null; // function(tracker, position, scroll, shift) - this.clickHandler = null; // function(tracker, position, quick, shift) - this.dragHandler = null; // function(tracker, position, delta, shift) + this.scrollHandler = null; // function(tracker, position, scroll, shift) + this.clickHandler = null; // function(tracker, position, quick, shift) + this.dragHandler = null; // function(tracker, position, delta, shift) + + (function () { + ieSelf = { + hasMouse: hasMouse, + onMouseOver: onMouseOver, + onMouseOut: onMouseOut, + onMouseUp: onMouseUp, + onMouseMove: onMouseMove + }; + })(); + this.isTracking = function () { + return tracking; + }; + + this.setTracking = function (track) { + if (track) { + startTracking(); + } else { + stopTracking(); + } + }; function startTracking() { if (!tracking) { @@ -425,31 +400,51 @@ $.Utils.stopEvent(event); } - - (function () { - ieSelf = { - hasMouse: hasMouse, - onMouseOver: onMouseOver, - onMouseOut: onMouseOut, - onMouseUp: onMouseUp, - onMouseMove: onMouseMove - }; - })(); - - - this.isTracking = function () { - return tracking; - }; - - this.setTracking = function (track) { - if (track) { - startTracking(); - } else { - stopTracking(); - } - }; - }; + function getMouseAbsolute( event ) { + return $.Utils.getMousePosition(event); + } + + function getMouseRelative( event, elmt ) { + var mouse = $.Utils.getMousePosition(event); + var offset = $.Utils.getElementPosition(elmt); + + return mouse.minus(offset); + } + + /** + * Returns true if elmtB is a child node of elmtA, or if they're equal. + */ + function isChild( elmtA, elmtB ) { + var body = document.body; + while (elmtB && elmtA != elmtB && body != elmtB) { + try { + elmtB = elmtB.parentNode; + } catch (e) { + return false; + } + } + return elmtA == elmtB; + } + + function onGlobalMouseDown() { + buttonDownAny = true; + } + + function onGlobalMouseUp() { + buttonDownAny = false; + } + + + (function () { + if (isIE) { + $.Utils.addEvent(document, "mousedown", onGlobalMouseDown, false); + $.Utils.addEvent(document, "mouseup", onGlobalMouseUp, false); + } else { + $.Utils.addEvent(window, "mousedown", onGlobalMouseDown, true); + $.Utils.addEvent(window, "mouseup", onGlobalMouseUp, true); + } + })(); }( OpenSeadragon ));