From 09e494091e3fda5faf3edb80856202468520294e Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Tue, 2 Dec 2014 13:17:56 -0800
Subject: [PATCH] More fixes for tiledImage animation

---
 src/tiledimage.js             |  1 +
 src/viewer.js                 |  9 +++++++++
 test/demo/collections/main.js | 19 ++++++++++++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/tiledimage.js b/src/tiledimage.js
index 9be1092c..fc444b83 100644
--- a/src/tiledimage.js
+++ b/src/tiledimage.js
@@ -209,6 +209,7 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
 
         if (this._xSpring.current.value !== oldX || this._ySpring.current.value !== oldY ||
                 this._scaleSpring.current.value !== oldScale) {
+            this._updateForScale();
             this._needsDraw = true;
             return true;
         }
diff --git a/src/viewer.js b/src/viewer.js
index 39fa9bd9..35bcfd80 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -666,6 +666,10 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
                 delete options.index;
             }
 
+            if (options.collectionImmediately === undefined) {
+                options.collectionImmediately = true;
+            }
+
             var originalSuccess = options.success;
             options.success = function(event) {
                 successes++;
@@ -1237,6 +1241,8 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
      *  supports except arrays of images.
      * Note that you can specify options.width or options.height, but not both.
      * The other dimension will be calculated according to the item's aspect ratio.
+     * If collectionMode is on (see {@link OpenSeadragon.Options}), the new image is
+     * automatically arranged with the others.
      * @function
      * @param {Object} options
      * @param {String|Object|Function} options.tileSource - The TileSource specifier.
@@ -1260,6 +1266,8 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
      * @param {Function} [options.error] A function that gets called if the image is
      * unable to be added. It's passed the error event object, which contains "message"
      * and "source" properties.
+     * @param {Boolean} [options.collectionImmediately=false] If collectionMode is on,
+     * specifies whether to snap to the new arrangement immediately or to animate to it.
      * @fires OpenSeadragon.World.event:add-item
      * @fires OpenSeadragon.Viewer.event:add-item-failed
      */
@@ -1355,6 +1363,7 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
 
                 if (_this.collectionMode) {
                     _this.world.arrange({
+                        immediately: queueItem.options.collectionImmediately,
                         rows: _this.collectionRows,
                         layout: _this.collectionLayout,
                         tileSize: _this.collectionTileSize,
diff --git a/test/demo/collections/main.js b/test/demo/collections/main.js
index fb1247b8..21e2d844 100644
--- a/test/demo/collections/main.js
+++ b/test/demo/collections/main.js
@@ -9,7 +9,7 @@
             var testInitialOpen = false;
             var testOverlays = false;
             var testMargins = false;
-            var testNavigator = true;
+            var testNavigator = false;
             var margins;
 
             var config = {
@@ -21,7 +21,7 @@
                 // referenceStripScroll: 'vertical',
                 navPrevNextWrap: false,
                 preserveViewport: false,
-                // collectionMode: true,
+                collectionMode: true,
                 // collectionRows: 3,
                 // collectionLayout: 'vertical',
                 // collectionTileSize: 10,
@@ -112,7 +112,7 @@
             }
 
             if (!testInitialOpen) {
-                this.gridTest();
+                this.basicTest();
             }
         },
 
@@ -132,6 +132,19 @@
             image.setPosition(point);
         },
 
+        // ----------
+        add: function() {
+            var self = this;
+
+            this.viewer.addTiledImage({
+                tileSource: "../../data/testpattern.dzi",
+                width: 1,
+                success: function() {
+                    self.viewer.viewport.goHome();
+                }
+            });
+        },
+
         // ----------
         basicTest: function() {
             var self = this;