wait #6328 @0.5

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 3c1ee79f751f3036536088a73404aabda09974a3..910fff22cdf421b8779e6fbf94971940d40de6d8 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -1064,12 +1064,12 @@ FluidbookLoader.prototype = {
 
     loadImage: function (src, width, height, type, page, cb) {
         var $this = this;
-        var callback = function () {
+        var callback = function (img) {
             if (cb && typeof cb == 'function') {
                 setTimeout(function () {
                     if (!callbackCalled) {
                         callbackCalled = true;
-                        cb();
+                        cb(img);
                     }
                 }, $this.fluidbook.shortLoading ? 0 : 10);
             }
@@ -1086,7 +1086,7 @@ FluidbookLoader.prototype = {
         var callbackCalled = false;
 
         $(img).one('load', function () {
-            callback();
+            callback(img);
         });
 
         $(img).one('error', function () {
@@ -1104,7 +1104,7 @@ FluidbookLoader.prototype = {
             img.type = type;
         }
         if (img.complete || img.readyState === 'complete' || img.readyState === 4) {
-            callback();
+            callback(img);
         }
         var res = $(img);
         $(res).attr('aria-hidden', true);

diff --git a/js/libs/fluidbook/links/fluidbook.links.zoom.js b/js/libs/fluidbook/links/fluidbook.links.zoom.js
index 02b316821b7b45b6de37a45e17f10c91f2d5002d..e4cf54ec9b29b2df3addb85b6256ac3c97abe88a 100644 (file)
--- a/js/libs/fluidbook/links/fluidbook.links.zoom.js
+++ b/js/libs/fluidbook/links/fluidbook.links.zoom.js
@@ -353,6 +353,7 @@ FluidbookLinksZoom.prototype = {
 
             // Load image before running zoom up animation
             $this.fluidbook.displayLoader();
+            console.log(zoomImage, $this.fluidbook.loader.getURL(zoomImage));
             $this.fluidbook.loader.loadImage($this.fluidbook.loader.getURL(zoomImage), null, null, null, null, function (img) {
                 // Image is set as a background for better scaling / fitting via CSS
                 z.css('background-image', 'url(' + img.src + ')');