Merge branch 'master' into merger

fixed Conflicts:
	src/drawer.js

changelog.txt

@@ -50,6 +50,7 @@ OPENSEADRAGON CHANGELOG
 * Viewport.setRotation now allows all rotation angles (#466)
 * Pinch rotate is now available (defaults to off) (#468)
 * Added option for home button to fill viewer (#474)
+* Better handling of mid-update image loaded callbacks (#409)
 
 1.1.1:
 

src/drawer.js

@@ -36,6 +36,12 @@
 
 /**
  * @class Drawer
+<<<<<<< HEAD
+=======
+ * @classdesc Handles rendering of tiles for an {@link OpenSeadragon.Viewer}.
+ * A new instance is created for each TileSource opened (see {@link OpenSeadragon.Viewer#drawer}).
+ *
+>>>>>>> master
  * @memberof OpenSeadragon
  * @classdesc Handles rendering of tiles for an {@link OpenSeadragon.Viewer}.
  * @param {Object} options - Options for this Drawer.

src/imageLoader.js

@@ -133,7 +133,14 @@ $.ImageLoader.prototype = /** @lends OpenSeadragon.ImageLoader.prototype */{
         else {
            this.jobQueue.push( newJob );
         }
+    },
 
+    /**
+     * Clear any unstarted image loading jobs from the queue.
+     * @method
+     */
+    clear: function() {
+        this.jobQueue = [];
     }
 };
 

src/tiledimage.js

@@ -571,22 +571,21 @@ function loadTile( tiledImage, tile, time ) {
 }
 
 function onTileLoad( tiledImage, tile, time, image ) {
-    tile.loading = false;
+    if ( !image ) {
-
-    if ( tiledImage.midUpdate ) {
-        $.console.warn( "Tile load callback in middle of drawing routine." );
-        return;
-    } else if ( !image ) {
         $.console.log( "Tile %s failed to load: %s", tile, tile.url );
         if( !tiledImage.debugMode ){
+            tile.loading = false;
             tile.exists = false;
             return;
         }
     } else if ( time < tiledImage.lastResetTime ) {
         $.console.log( "Ignoring tile %s loaded before reset: %s", tile, tile.url );
+        tile.loading = false;
         return;
     }
 
+    var finish = function() {
+        tile.loading = false;
         tile.loaded = true;
         tile.image  = image;
 
@@ -596,6 +595,16 @@ function onTileLoad( tiledImage, tile, time, image ) {
             cutoff: cutoff,
             tiledImage: tiledImage
         });
+    };
+
+    // Check if we're mid-update; this can happen on IE8 because image load events for
+    // cached images happen immediately there
+    if ( !tiledImage.midUpdate ) {
+        finish();
+    } else {
+        // Wait until after the update, in case caching unloads any tiles
+        window.setTimeout( finish, 1);
+    }
 
     tiledImage.updateAgain = true;
 }