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

refactoring after lint left an error related to drawer and overlays

Browse Source
This commit is contained in:
thatcher 2013-02-13 09:05:35 -05:00
parent a0fd2b3324
commit 0540e834b4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -6,7 +6,7 @@
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 9 BUILD_MINOR: 9
BUILD_ID: 113s BUILD_ID: 114
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

8
openseadragon.js
View File

@ -1,7 +1,7 @@
/*globals OpenSeadragon*/ /*globals OpenSeadragon*/
/** /**
* @version OpenSeadragon 0.9.113s * @version OpenSeadragon 0.9.114
* *
* @fileOverview * @fileOverview
* <h2> * <h2>
@ -8614,7 +8614,7 @@ $.Drawer = function( options ) {
for( i = 0; i < this.overlays.length; i++ ){ for( i = 0; i < this.overlays.length; i++ ){
if( $.isPlainObject( this.overlays[ i ] ) ){ if( $.isPlainObject( this.overlays[ i ] ) ){
addOverlayFromConfiguration( this, this.overlays[ i ]); this.overlays[ i ] = addOverlayFromConfiguration( this, this.overlays[ i ]);
} else if ( $.isFunction( this.overlays[ i ] ) ){ } else if ( $.isFunction( this.overlays[ i ] ) ){
//TODO //TODO
@ -8856,13 +8856,13 @@ $.Drawer.prototype = {
rect = drawer.viewport.imageToViewportRectangle( rect ); rect = drawer.viewport.imageToViewportRectangle( rect );
} }
if( overlay.placement ){ if( overlay.placement ){
drawer.overlays[ i ] = new $.Overlay( return new $.Overlay(
element, element,
drawer.viewport.pointFromPixel(rect), drawer.viewport.pointFromPixel(rect),
$.OverlayPlacement[overlay.placement.toUpperCase()] $.OverlayPlacement[overlay.placement.toUpperCase()]
); );
}else{ }else{
drawer.overlays[ i ] = new $.Overlay( element, rect ); return new $.Overlay( element, rect );
} }
} }

2
package.json
View File

@ -1,4 +1,4 @@
{ {
"name": "openseadragon", "name": "openseadragon",
"version": "0.9.113" "version": "0.9.114"
} }

6
src/drawer.js
View File

@ -111,7 +111,7 @@ $.Drawer = function( options ) {
for( i = 0; i < this.overlays.length; i++ ){ for( i = 0; i < this.overlays.length; i++ ){
if( $.isPlainObject( this.overlays[ i ] ) ){ if( $.isPlainObject( this.overlays[ i ] ) ){
addOverlayFromConfiguration( this, this.overlays[ i ]); this.overlays[ i ] = addOverlayFromConfiguration( this, this.overlays[ i ]);
} else if ( $.isFunction( this.overlays[ i ] ) ){ } else if ( $.isFunction( this.overlays[ i ] ) ){
//TODO //TODO
@ -353,13 +353,13 @@ $.Drawer.prototype = {
rect = drawer.viewport.imageToViewportRectangle( rect ); rect = drawer.viewport.imageToViewportRectangle( rect );
} }
if( overlay.placement ){ if( overlay.placement ){
drawer.overlays[ i ] = new $.Overlay( return new $.Overlay(
element, element,
drawer.viewport.pointFromPixel(rect), drawer.viewport.pointFromPixel(rect),
$.OverlayPlacement[overlay.placement.toUpperCase()] $.OverlayPlacement[overlay.placement.toUpperCase()]
); );
}else{ }else{
drawer.overlays[ i ] = new $.Overlay( element, rect ); return new $.Overlay( element, rect );
} }
} }