From 211127b87bb818d40649188353cf22b47bfe5b83 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Wed, 3 Dec 2014 11:13:06 -0800 Subject: [PATCH] Fixed window resize for navigator with multi-image --- src/navigator.js | 17 ++--------------- test/demo/collections/main.js | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/navigator.js b/src/navigator.js index df4b637a..512d4671 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -272,23 +272,10 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /* (this.container.clientWidth === 0 ? 1 : this.container.clientWidth), (this.container.clientHeight === 0 ? 1 : this.container.clientHeight) ); + if ( !containerSize.equals( this.oldContainerSize ) ) { - var oldBounds = this.viewport.getBounds(); - var oldCenter = this.viewport.getCenter(); this.viewport.resize( containerSize, true ); - var worldBounds = this.world.getHomeBounds(); - var aspectRatio = worldBounds.width / worldBounds.height; - var imageHeight = 1 / aspectRatio; - var newWidth = oldBounds.width <= 1 ? oldBounds.width : 1; - var newHeight = oldBounds.height <= imageHeight ? - oldBounds.height : imageHeight; - var newBounds = new $.Rect( - oldCenter.x - ( newWidth / 2.0 ), - oldCenter.y - ( newHeight / 2.0 ), - newWidth, - newHeight - ); - this.viewport.fitBounds( newBounds, true ); + this.viewport.goHome(true); this.oldContainerSize = containerSize; this.drawer.update(); } diff --git a/test/demo/collections/main.js b/test/demo/collections/main.js index 01f7229d..d18710a2 100644 --- a/test/demo/collections/main.js +++ b/test/demo/collections/main.js @@ -9,7 +9,7 @@ var testInitialOpen = true; var testOverlays = false; var testMargins = false; - var testNavigator = false; + var testNavigator = true; var margins; var config = {