viewerjs 1.10.4 → 1.11.0

package/src/js/render.js

@@ -15,6 +15,7 @@ import {
   getImageNaturalSizes,
   getTransforms,
   hasClass,
+  isNumber,
   removeClass,
   removeListener,
   setData,
@@ -96,7 +97,10 @@ export default {
           }
         });
 
-        img.src = src || url;
+        if (options.navbar) {
+          img.src = src || url;
+        }
+
         img.alt = alt;
         img.setAttribute('data-original-url', url || src);
         item.setAttribute('data-index', index);
@@ -204,6 +208,7 @@ export default {
 
     sizingImage = getImageNaturalSizes(image, options, (naturalWidth, naturalHeight) => {
       const aspectRatio = naturalWidth / naturalHeight;
+      let initialCoverage = Math.max(0, Math.min(1, options.initialCoverage));
       let width = viewerWidth;
       let height = viewerHeight;
 
@@ -215,8 +220,9 @@ export default {
         width = viewerHeight * aspectRatio;
       }
 
-      width = Math.min(width * 0.9, naturalWidth);
-      height = Math.min(height * 0.9, naturalHeight);
+      initialCoverage = isNumber(initialCoverage) ? initialCoverage : 0.9;
+      width = Math.min(width * initialCoverage, naturalWidth);
+      height = Math.min(height * initialCoverage, naturalHeight);
 
       const left = (viewerWidth - width) / 2;
       const top = (viewerHeight - height) / 2;

package/src/js/viewer.js

@@ -15,6 +15,7 @@ import {
   CLASS_INVISIBLE,
   DATA_ACTION,
   EVENT_CLICK,
+  EVENT_ERROR,
   EVENT_LOAD,
   EVENT_READY,
   NAMESPACE,
@@ -152,6 +153,7 @@ class Viewer {
           forEach(images, (image) => {
             if (!image.complete) {
               removeListener(image, EVENT_LOAD, progress);
+              removeListener(image, EVENT_ERROR, progress);
             }
           });
         },
@@ -161,7 +163,19 @@ class Viewer {
         if (image.complete) {
           progress();
         } else {
-          addListener(image, EVENT_LOAD, progress, {
+          let onLoad;
+          let onError;
+
+          addListener(image, EVENT_LOAD, onLoad = () => {
+            removeListener(image, EVENT_ERROR, onError);
+            progress();
+          }, {
+            once: true,
+          });
+          addListener(image, EVENT_ERROR, onError = () => {
+            removeListener(image, EVENT_LOAD, onLoad);
+            progress();
+          }, {
             once: true,
           });
         }