mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-28 16:16:08 +03:00
Code Issues Projects Releases Wiki Activity

modified local functions delegate and EventHandlerList to be static namespace functions on OpenSeadragon namespace

Browse Source
This commit is contained in:
thatcher 2011-12-05 17:38:25 -05:00
parent 95cd02ac40
commit deaabc6a91
1 changed files with 61 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
OpenSeadragon.debug.js
View File

@ -1,17 +1,24 @@
// (c) 2011 Christopher Thatcher /**
// (c) 2010 OpenSeadragon, (c) 2010 CodePlex Foundation * (c) 2011 Christopher Thatcher
// @NEWBSD@ * (c) 2010 OpenSeadragon, (c) 2010 CodePlex Foundation
*
* OpenSeadragon @VERSION@
-------------------------------------------------------------------------------
@NEWBSD@
-------------------------------------------------------------------------------
*
**/
Seadragon = function(){}; Seadragon = function(){};
(function($){ (function($){
var EventHandlerList = function EventHandlerList() { $.EventHandlerList = function() {
this._list = {}; this._list = {};
}; };
EventHandlerList.prototype = { $.EventHandlerList.prototype = {
addHandler: function(id, handler) { addHandler: function(id, handler) {
var events = this._list[ id ]; var events = this._list[ id ];
@ -44,7 +51,7 @@ EventHandlerList.prototype = {
}; };
function delegate(object, method) { $.delegate = function(object, method) {
return function() { return function() {
if (arguments === undefined) if (arguments === undefined)
arguments = []; arguments = [];
@ -53,7 +60,7 @@ function delegate(object, method) {
}; };
function format(){ $.format = function(){
var args = arguments, var args = arguments,
useLocale = false; useLocale = false;
var result = ''; var result = '';
@ -1117,13 +1124,13 @@ $.NavControl = function(viewer) {
} }
$.NavControl.prototype = { $.NavControl.prototype = {
initialize: function() { initialize: function() {
var beginZoomingInHandler = delegate(this, this._beginZoomingIn); var beginZoomingInHandler = $.delegate(this, this._beginZoomingIn);
var endZoomingHandler = delegate(this, this._endZooming); var endZoomingHandler = $.delegate(this, this._endZooming);
var doSingleZoomInHandler = delegate(this, this._doSingleZoomIn); var doSingleZoomInHandler = $.delegate(this, this._doSingleZoomIn);
var beginZoomingOutHandler = delegate(this, this._beginZoomingOut); var beginZoomingOutHandler = $.delegate(this, this._beginZoomingOut);
var doSingleZoomOutHandler = delegate(this, this._doSingleZoomOut); var doSingleZoomOutHandler = $.delegate(this, this._doSingleZoomOut);
var onHomeHandler = delegate(this, this._onHome); var onHomeHandler = $.delegate(this, this._onHome);
var onFullPageHandler = delegate(this, this._onFullPage); var onFullPageHandler = $.delegate(this, this._onFullPage);
var navImages = this._viewer.config.navImages; var navImages = this._viewer.config.navImages;
@ -1182,7 +1189,7 @@ $.NavControl.prototype = {
this.elmt = this._group.get_element(); this.elmt = this._group.get_element();
this.elmt[SIGNAL] = true; // hack to get our controls to fade this.elmt[SIGNAL] = true; // hack to get our controls to fade
this._viewer.add_open(delegate(this, this._lightUp)); this._viewer.add_open($.delegate(this, this._lightUp));
}, },
get_events: function() { get_events: function() {
@ -1192,7 +1199,7 @@ $.NavControl.prototype = {
this._events = value; this._events = value;
}, },
_resolveUrl: function(url) { _resolveUrl: function(url) {
return format("{1}", this._viewer.get_prefixUrl(), url); return $.format("{1}", this._viewer.get_prefixUrl(), url);
}, },
_beginZoomingIn: function() { _beginZoomingIn: function() {
this._lastZoomTime = new Date().getTime(); this._lastZoomTime = new Date().getTime();
@ -1211,7 +1218,7 @@ $.NavControl.prototype = {
this._zooming = false; this._zooming = false;
}, },
_scheduleZoom: function() { _scheduleZoom: function() {
window.setTimeout(delegate(this, this._doZoom), 10); window.setTimeout($.delegate(this, this._doZoom), 10);
}, },
_doZoom: function() { _doZoom: function() {
if (this._zooming && this._viewer.viewport) { if (this._zooming && this._viewer.viewport) {
@ -1334,7 +1341,7 @@ $.Viewer = function(element, xmlPath, prefixUrl, controls, overlays, overlayCont
$.Viewer.prototype = { $.Viewer.prototype = {
initialize: function () { initialize: function () {
this._events = new EventHandlerList(); this._events = new $.EventHandlerList();
this._container = $.Utils.makeNeutralElement("div"); this._container = $.Utils.makeNeutralElement("div");
this._canvas = $.Utils.makeNeutralElement("div"); this._canvas = $.Utils.makeNeutralElement("div");
@ -1384,10 +1391,10 @@ $.Viewer.prototype = {
controlsTRStyle.right = controlsBRStyle.right = "0px"; controlsTRStyle.right = controlsBRStyle.right = "0px";
controlsBLStyle.bottom = controlsBRStyle.bottom = "0px"; controlsBLStyle.bottom = controlsBRStyle.bottom = "0px";
innerTracker.clickHandler = delegate(this, this._onCanvasClick); innerTracker.clickHandler = $.delegate(this, this._onCanvasClick);
innerTracker.dragHandler = delegate(this, this._onCanvasDrag); innerTracker.dragHandler = $.delegate(this, this._onCanvasDrag);
innerTracker.releaseHandler = delegate(this, this._onCanvasRelease); innerTracker.releaseHandler = $.delegate(this, this._onCanvasRelease);
innerTracker.scrollHandler = delegate(this, this._onCanvasScroll); innerTracker.scrollHandler = $.delegate(this, this._onCanvasScroll);
innerTracker.setTracking(true); // default state innerTracker.setTracking(true); // default state
if (this.get_showNavigationControl()) { if (this.get_showNavigationControl()) {
@ -1400,11 +1407,11 @@ $.Viewer.prototype = {
this.addControl(this._customControls[i].id, this._customControls[i].anchor); this.addControl(this._customControls[i].id, this._customControls[i].anchor);
} }
outerTracker.enterHandler = delegate(this, this._onContainerEnter); outerTracker.enterHandler = $.delegate(this, this._onContainerEnter);
outerTracker.exitHandler = delegate(this, this._onContainerExit); outerTracker.exitHandler = $.delegate(this, this._onContainerExit);
outerTracker.releaseHandler = delegate(this, this._onContainerRelease); outerTracker.releaseHandler = $.delegate(this, this._onContainerRelease);
outerTracker.setTracking(true); // always tracking outerTracker.setTracking(true); // always tracking
window.setTimeout(delegate(this, this._beginControlsAutoHide), 1); // initial fade out window.setTimeout($.delegate(this, this._beginControlsAutoHide), 1); // initial fade out
this._container.appendChild(this._canvas); this._container.appendChild(this._canvas);
this._container.appendChild(this._controlsTL); this._container.appendChild(this._controlsTL);
@ -1437,10 +1444,10 @@ $.Viewer.prototype = {
this._controlsShouldFade = true; this._controlsShouldFade = true;
this._controlsFadeBeginTime = new Date().getTime() + this._controlsFadeDelay; this._controlsFadeBeginTime = new Date().getTime() + this._controlsFadeDelay;
window.setTimeout(delegate(this, this._scheduleControlsFade), this._controlsFadeDelay); window.setTimeout($.delegate(this, this._scheduleControlsFade), this._controlsFadeDelay);
}, },
_scheduleControlsFade: function () { _scheduleControlsFade: function () {
window.setTimeout(delegate(this, this._updateControlsFade), 20); window.setTimeout($.delegate(this, this._updateControlsFade), 20);
}, },
_updateControlsFade: function () { _updateControlsFade: function () {
if (this._controlsShouldFade) { if (this._controlsShouldFade) {
@ -1580,7 +1587,7 @@ $.Viewer.prototype = {
this._lastOpenStartTime = new Date().getTime(); // to ignore earlier opens this._lastOpenStartTime = new Date().getTime(); // to ignore earlier opens
window.setTimeout(delegate(this, function () { window.setTimeout($.delegate(this, function () {
if (this._lastOpenStartTime > this._lastOpenEndTime) { if (this._lastOpenStartTime > this._lastOpenEndTime) {
this._setMessage($.Strings.getString("Messages.Loading")); this._setMessage($.Strings.getString("Messages.Loading"));
} }
@ -1646,7 +1653,7 @@ $.Viewer.prototype = {
}, },
_scheduleUpdate: function (updateFunc, prevUpdateTime) { _scheduleUpdate: function (updateFunc, prevUpdateTime) {
if (this._animating) { if (this._animating) {
return window.setTimeout(delegate(this, updateFunc), 1); return window.setTimeout($.delegate(this, updateFunc), 1);
} }
var currentTime = new Date().getTime(); var currentTime = new Date().getTime();
@ -1654,7 +1661,7 @@ $.Viewer.prototype = {
var targetTime = prevUpdateTime + 1000 / 60; // 60 fps ideal var targetTime = prevUpdateTime + 1000 / 60; // 60 fps ideal
var deltaTime = Math.max(1, targetTime - currentTime); var deltaTime = Math.max(1, targetTime - currentTime);
return window.setTimeout(delegate(this, updateFunc), deltaTime); return window.setTimeout($.delegate(this, updateFunc), deltaTime);
}, },
_updateMulti: function () { _updateMulti: function () {
if (!this.source) { if (!this.source) {
@ -1958,11 +1965,11 @@ $.Viewer.prototype = {
openDzi: function (xmlUrl, xmlString) { openDzi: function (xmlUrl, xmlString) {
var currentTime = this._beforeOpen(); var currentTime = this._beforeOpen();
$.DziTileSourceHelper.createFromXml(xmlUrl, xmlString, $.DziTileSourceHelper.createFromXml(xmlUrl, xmlString,
$.Utils.createCallback(null, delegate(this, this._onOpen), currentTime)); $.Utils.createCallback(null, $.delegate(this, this._onOpen), currentTime));
}, },
openTileSource: function (tileSource) { openTileSource: function (tileSource) {
var currentTime = beforeOpen(); var currentTime = beforeOpen();
window.setTimeout(delegate(this, function () { window.setTimeout($.delegate(this, function () {
onOpen(currentTime, tileSource); onOpen(currentTime, tileSource);
}), 1); }), 1);
}, },
@ -2346,11 +2353,11 @@ $.Job.prototype = {
}, },
start: function() { start: function() {
this._image = new Image(); this._image = new Image();
this._image.onload = delegate(this, this._onloadHandler); this._image.onload = $.delegate(this, this._onloadHandler);
this._image.onabort = delegate(this, this._onerrorHandler); this._image.onabort = $.delegate(this, this._onerrorHandler);
this._image.onerror = delegate(this, this._onerrorHandler); this._image.onerror = $.delegate(this, this._onerrorHandler);
this._timeout = window.setTimeout(delegate(this, this._onerrorHandler), this.TIMEOUT); this._timeout = window.setTimeout($.delegate(this, this._onerrorHandler), this.TIMEOUT);
this._image.src = this._src; this._image.src = this._src;
} }
@ -2378,7 +2385,7 @@ $.ImageLoader.prototype = {
return false; return false;
} }
var func = $.Utils.createCallback(null, delegate(this, this._onComplete), callback); var func = $.Utils.createCallback(null, $.delegate(this, this._onComplete), callback);
var job = new $.Job(src, func); var job = new $.Job(src, func);
this._downloading++; this._downloading++;
@ -2568,13 +2575,13 @@ $._DziTileSourceHelper.prototype = {
} }
if (async) { if (async) {
if (xmlString) { if (xmlString) {
var handler = delegate(this, this.processXml); var handler = $.delegate(this, this.processXml);
window.setTimeout(function() { window.setTimeout(function() {
var source = finish(handler, $.Utils.parseXml(xmlString)); var source = finish(handler, $.Utils.parseXml(xmlString));
callback(source, error); // call after finish sets error callback(source, error); // call after finish sets error
}, 1); }, 1);
} else { } else {
var handler = delegate(this, this.processResponse); var handler = $.delegate(this, this.processResponse);
$.Utils.makeAjaxRequest(xmlUrl, function(xhr) { $.Utils.makeAjaxRequest(xmlUrl, function(xhr) {
var source = finish(handler, xhr); var source = finish(handler, xhr);
callback(source, error); // call after finish sets error callback(source, error); // call after finish sets error
@ -2585,9 +2592,9 @@ $._DziTileSourceHelper.prototype = {
} }
if (xmlString) { if (xmlString) {
return finish(delegate(this, this.processXml), $.Utils.parseXml(xmlString)); return finish($.delegate(this, this.processXml), $.Utils.parseXml(xmlString));
} else { } else {
return finish(delegate(this, this.processResponse), $.Utils.makeAjaxRequest(xmlUrl)); return finish($.delegate(this, this.processResponse), $.Utils.makeAjaxRequest(xmlUrl));
} }
}, },
processResponse: function(xhr, tilesUrl) { processResponse: function(xhr, tilesUrl) {
@ -2709,7 +2716,7 @@ $.Button = function(properties, events) {
$.Button.prototype = { $.Button.prototype = {
initialize: function(events) { initialize: function(events) {
this._events = new EventHandlerList(); this._events = new $.EventHandlerList();
if (events.onPress != undefined) if (events.onPress != undefined)
this.add_onPress(events.onPress); this.add_onPress(events.onPress);
@ -2759,17 +2766,17 @@ $.Button.prototype = {
styleGroup.top = styleHover.top = styleDown.top = ""; styleGroup.top = styleHover.top = styleDown.top = "";
} }
this._tracker.enterHandler = delegate(this, this._enterHandler); this._tracker.enterHandler = $.delegate(this, this._enterHandler);
this._tracker.exitHandler = delegate(this, this._exitHandler); this._tracker.exitHandler = $.delegate(this, this._exitHandler);
this._tracker.pressHandler = delegate(this, this._pressHandler); this._tracker.pressHandler = $.delegate(this, this._pressHandler);
this._tracker.releaseHandler = delegate(this, this._releaseHandler); this._tracker.releaseHandler = $.delegate(this, this._releaseHandler);
this._tracker.clickHandler = delegate(this, this._clickHandler); this._tracker.clickHandler = $.delegate(this, this._clickHandler);
this._tracker.setTracking(true); this._tracker.setTracking(true);
this._outTo($.ButtonState.REST); this._outTo($.ButtonState.REST);
}, },
_scheduleFade: function() { _scheduleFade: function() {
window.setTimeout(delegate(this, this._updateFade), 20); window.setTimeout($.delegate(this, this._updateFade), 20);
}, },
_updateFade: function() { _updateFade: function() {
if (this._shouldFade) { if (this._shouldFade) {
@ -2789,7 +2796,7 @@ $.Button.prototype = {
_beginFading: function() { _beginFading: function() {
this._shouldFade = true; this._shouldFade = true;
this._fadeBeginTime = new Date().getTime() + this._fadeDelay; this._fadeBeginTime = new Date().getTime() + this._fadeDelay;
window.setTimeout(delegate(this, this._scheduleFade), this._fadeDelay); window.setTimeout($.delegate(this, this._scheduleFade), this._fadeDelay);
}, },
_stopFading: function() { _stopFading: function() {
this._shouldFade = false; this._shouldFade = false;
@ -2971,9 +2978,9 @@ $.ButtonGroup.prototype = {
this._group.appendChild(buttons[i].get_element()); this._group.appendChild(buttons[i].get_element());
} }
tracker.enterHandler = delegate(this, this._enterHandler); tracker.enterHandler = $.delegate(this, this._enterHandler);
tracker.exitHandler = delegate(this, this._exitHandler); tracker.exitHandler = $.delegate(this, this._exitHandler);
tracker.releaseHandler = delegate(this, this._releaseHandler); tracker.releaseHandler = $.delegate(this, this._releaseHandler);
tracker.setTracking(true); tracker.setTracking(true);
}, },
@ -3505,7 +3512,7 @@ $.Drawer.prototype = {
_loadTile: function(tile, time) { _loadTile: function(tile, time) {
tile.loading = this._imageLoader.loadImage(tile.url, tile.loading = this._imageLoader.loadImage(tile.url,
$.Utils.createCallback(null, delegate(this, this._onTileLoad), tile, time)); $.Utils.createCallback(null, $.delegate(this, this._onTileLoad), tile, time));
}, },
_onTileLoad: function(tile, time, image) { _onTileLoad: function(tile, time, image) {