From 0540e834b4c5c8be24f8f1ff39757778cf5432d5 Mon Sep 17 00:00:00 2001 From: thatcher Date: Wed, 13 Feb 2013 09:05:35 -0500 Subject: [PATCH] refactoring after lint left an error related to drawer and overlays --- build.properties | 2 +- openseadragon.js | 8 ++++---- package.json | 2 +- src/drawer.js | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 04f9c9a1..946b4e02 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ PROJECT: openseadragon BUILD_MAJOR: 0 BUILD_MINOR: 9 -BUILD_ID: 113s +BUILD_ID: 114 BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} diff --git a/openseadragon.js b/openseadragon.js index ca1ef96b..d61df341 100644 --- a/openseadragon.js +++ b/openseadragon.js @@ -1,7 +1,7 @@ /*globals OpenSeadragon*/ /** - * @version OpenSeadragon 0.9.113s + * @version OpenSeadragon 0.9.114 * * @fileOverview *

@@ -8614,7 +8614,7 @@ $.Drawer = function( options ) { for( i = 0; i < this.overlays.length; 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 ] ) ){ //TODO @@ -8856,13 +8856,13 @@ $.Drawer.prototype = { rect = drawer.viewport.imageToViewportRectangle( rect ); } if( overlay.placement ){ - drawer.overlays[ i ] = new $.Overlay( + return new $.Overlay( element, drawer.viewport.pointFromPixel(rect), $.OverlayPlacement[overlay.placement.toUpperCase()] ); }else{ - drawer.overlays[ i ] = new $.Overlay( element, rect ); + return new $.Overlay( element, rect ); } } diff --git a/package.json b/package.json index 7d89b89c..c5ac08b0 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,4 @@ { "name": "openseadragon", - "version": "0.9.113" + "version": "0.9.114" } \ No newline at end of file diff --git a/src/drawer.js b/src/drawer.js index c5a86f45..4a76a056 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -111,7 +111,7 @@ $.Drawer = function( options ) { for( i = 0; i < this.overlays.length; 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 ] ) ){ //TODO @@ -353,13 +353,13 @@ $.Drawer.prototype = { rect = drawer.viewport.imageToViewportRectangle( rect ); } if( overlay.placement ){ - drawer.overlays[ i ] = new $.Overlay( + return new $.Overlay( element, drawer.viewport.pointFromPixel(rect), $.OverlayPlacement[overlay.placement.toUpperCase()] ); }else{ - drawer.overlays[ i ] = new $.Overlay( element, rect ); + return new $.Overlay( element, rect ); } }