found local variable navControl that should have been a property of Viewer. removed getNavControl accessor in favor of direct property access

This commit is contained in:
thatcher 2011-12-13 07:24:34 -05:00
parent 3e39bccbbe
commit 7cac08a2f4
4 changed files with 21 additions and 21 deletions

View File

@ -6,7 +6,7 @@
PROJECT: openseadragon
BUILD_MAJOR: 0
BUILD_MINOR: 8
BUILD_ID: 09
BUILD_ID: 10
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

View File

@ -3,7 +3,7 @@
* (c) 2010 OpenSeadragon
* (c) 2010 CodePlex Foundation
*
* OpenSeadragon 0.8.09
* OpenSeadragon 0.8.10
* ----------------------------------------------------------------------------
*
* License: New BSD License (BSD)
@ -1636,11 +1636,12 @@ $.Viewer = function( options ) {
}
}
this.navControl = null;
if ( this.config.showNavigationControl ) {
navControl = (new $.NavControl(this)).elmt;
navControl.style.marginRight = "4px";
navControl.style.marginBottom = "4px";
this.addControl(navControl, $.ControlAnchor.BOTTOM_RIGHT);
this.navControl = (new $.NavControl(this)).elmt;
this.navControl.style.marginRight = "4px";
this.navControl.style.marginBottom = "4px";
this.addControl(this.navControl, $.ControlAnchor.BOTTOM_RIGHT);
}
for ( i = 0; i < this.customControls.length; i++ ) {
@ -1723,9 +1724,6 @@ $.Viewer.prototype = {
this.profiler.endUpdate();
},
getNavControl: function () {
return this._navControl;
},
add_open: function (handler) {
this.events.addHandler("open", handler);
},

View File

@ -63,8 +63,12 @@ $.TileSource.prototype = {
tileExists: function( level, x, y ) {
var numTiles = this.getNumTiles( level );
return level >= this.minLevel && level <= this.maxLevel &&
x >= 0 && y >= 0 && x < numTiles.x && y < numTiles.y;
return level >= this.minLevel &&
level <= this.maxLevel &&
x >= 0 &&
y >= 0 &&
x < numTiles.x &&
y < numTiles.y;
}
};

View File

@ -194,11 +194,12 @@ $.Viewer = function( options ) {
}
}
this.navControl = null;
if ( this.config.showNavigationControl ) {
navControl = (new $.NavControl(this)).elmt;
navControl.style.marginRight = "4px";
navControl.style.marginBottom = "4px";
this.addControl(navControl, $.ControlAnchor.BOTTOM_RIGHT);
this.navControl = (new $.NavControl(this)).elmt;
this.navControl.style.marginRight = "4px";
this.navControl.style.marginBottom = "4px";
this.addControl(this.navControl, $.ControlAnchor.BOTTOM_RIGHT);
}
for ( i = 0; i < this.customControls.length; i++ ) {
@ -281,9 +282,6 @@ $.Viewer.prototype = {
this.profiler.endUpdate();
},
getNavControl: function () {
return this._navControl;
},
add_open: function (handler) {
this.events.addHandler("open", handler);
},