build: release 1.6.1

fengyuanchen · Jun 14, 2020 · beadfd9 · beadfd9
1 parent 4072858
commit beadfd9
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## next
+## 1.6.1 (Jun 14, 2020)
 
 - Improve image filtering.
 

diff --git a/dist/viewer.esm.js b/dist/viewer.esm.js
@@ -1,11 +1,11 @@
 /*!
- * Viewer.js v1.6.0
+ * Viewer.js v1.6.1
  * https://fengyuanchen.github.io/viewerjs
  *
  * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2020-06-06T11:26:26.858Z
+ * Date: 2020-06-14T07:47:18.114Z
  */
 
 function _typeof(obj) {
@@ -1059,13 +1059,8 @@ var render = {
     forEach(this.images, function (image, index) {
       var src = image.src;
       var alt = image.alt || getImageNameFromURL(src);
-      var url = options.url;
 
-      if (isString(url)) {
-        url = image.getAttribute(url);
-      } else if (isFunction(url)) {
-        url = url.call(_this, image);
-      }
+      var url = _this.getImageURL(image);
 
       if (src || url) {
         var item = document.createElement('li');
@@ -2553,6 +2548,8 @@ var methods = {
   },
   // Update viewer when images changed
   update: function update() {
+    var _this8 = this;
+
     var element = this.element,
         options = this.options,
         isImg = this.isImg; // Destroy viewer if the target image was deleted
@@ -2563,11 +2560,11 @@ var methods = {
 
     var images = [];
     forEach(isImg ? [element] : element.querySelectorAll('img'), function (image) {
-      if (options.filter) {
-        if (options.filter(image)) {
+      if (isFunction(options.filter)) {
+        if (options.filter.call(_this8, image)) {
           images.push(image);
         }
-      } else {
+      } else if (_this8.getImageURL(image)) {
         images.push(image);
       }
     });
@@ -2686,6 +2683,19 @@ var methods = {
 };
 
 var others = {
+  getImageURL: function getImageURL(image) {
+    var url = this.options.url;
+
+    if (isString(url)) {
+      url = image.getAttribute(url);
+    } else if (isFunction(url)) {
+      url = url.call(this, image);
+    } else {
+      url = '';
+    }
+
+    return url;
+  },
   open: function open() {
     var body = this.body;
     addClass(body, CLASS_OPEN);
@@ -2889,7 +2899,7 @@ var Viewer = /*#__PURE__*/function () {
           if (options.filter.call(_this, image)) {
             images.push(image);
           }
-        } else if (image.src) {
+        } else if (_this.getImageURL(image)) {
           images.push(image);
         }
       });

diff --git a/dist/viewer.js b/dist/viewer.js
@@ -1,11 +1,11 @@
 /*!
- * Viewer.js v1.6.0
+ * Viewer.js v1.6.1
  * https://fengyuanchen.github.io/viewerjs
  *
  * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2020-06-06T11:26:26.858Z
+ * Date: 2020-06-14T07:47:18.114Z
  */
 
 (function (global, factory) {
@@ -1065,13 +1065,8 @@
       forEach(this.images, function (image, index) {
         var src = image.src;
         var alt = image.alt || getImageNameFromURL(src);
-        var url = options.url;
 
-        if (isString(url)) {
-          url = image.getAttribute(url);
-        } else if (isFunction(url)) {
-          url = url.call(_this, image);
-        }
+        var url = _this.getImageURL(image);
 
         if (src || url) {
           var item = document.createElement('li');
@@ -2559,6 +2554,8 @@
     },
     // Update viewer when images changed
     update: function update() {
+      var _this8 = this;
+
       var element = this.element,
           options = this.options,
           isImg = this.isImg; // Destroy viewer if the target image was deleted
@@ -2569,11 +2566,11 @@
 
       var images = [];
       forEach(isImg ? [element] : element.querySelectorAll('img'), function (image) {
-        if (options.filter) {
-          if (options.filter(image)) {
+        if (isFunction(options.filter)) {
+          if (options.filter.call(_this8, image)) {
             images.push(image);
           }
-        } else {
+        } else if (_this8.getImageURL(image)) {
           images.push(image);
         }
       });
@@ -2692,6 +2689,19 @@
   };
 
   var others = {
+    getImageURL: function getImageURL(image) {
+      var url = this.options.url;
+
+      if (isString(url)) {
+        url = image.getAttribute(url);
+      } else if (isFunction(url)) {
+        url = url.call(this, image);
+      } else {
+        url = '';
+      }
+
+      return url;
+    },
     open: function open() {
       var body = this.body;
       addClass(body, CLASS_OPEN);
@@ -2895,7 +2905,7 @@
             if (options.filter.call(_this, image)) {
               images.push(image);
             }
-          } else if (image.src) {
+          } else if (_this.getImageURL(image)) {
             images.push(image);
           }
         });

diff --git a/dist/viewer.min.css b/dist/viewer.min.css
diff --git a/dist/viewer.min.js b/dist/viewer.min.js
diff --git a/docs/css/viewer.css b/docs/css/viewer.css
@@ -1,11 +1,11 @@
 /*!
- * Viewer.js v1.6.0
+ * Viewer.js v1.6.1
  * https://fengyuanchen.github.io/viewerjs
  *
  * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2020-06-06T11:26:24.345Z
+ * Date: 2020-06-14T07:47:15.792Z
  */
 
 .viewer-zoom-in::before,

diff --git a/docs/index.html b/docs/index.html
@@ -63,7 +63,7 @@
     <div class="container">
       <div class="row">
         <div class="col-md">
-          <h1>Viewer.js <small class="h6">v1.6.0</small></h1>
+          <h1>Viewer.js <small class="h6">v1.6.1</small></h1>
           <p class="lead">JavaScript image viewer.</p>
         </div>
         <div class="col-md">

diff --git a/docs/js/viewer.js b/docs/js/viewer.js
@@ -1,11 +1,11 @@
 /*!
- * Viewer.js v1.6.0
+ * Viewer.js v1.6.1
  * https://fengyuanchen.github.io/viewerjs
  *
  * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2020-06-06T11:26:26.858Z
+ * Date: 2020-06-14T07:47:18.114Z
  */
 
 (function (global, factory) {
@@ -1065,13 +1065,8 @@
       forEach(this.images, function (image, index) {
         var src = image.src;
         var alt = image.alt || getImageNameFromURL(src);
-        var url = options.url;
 
-        if (isString(url)) {
-          url = image.getAttribute(url);
-        } else if (isFunction(url)) {
-          url = url.call(_this, image);
-        }
+        var url = _this.getImageURL(image);
 
         if (src || url) {
           var item = document.createElement('li');
@@ -2559,6 +2554,8 @@
     },
     // Update viewer when images changed
     update: function update() {
+      var _this8 = this;
+
       var element = this.element,
           options = this.options,
           isImg = this.isImg; // Destroy viewer if the target image was deleted
@@ -2569,11 +2566,11 @@
 
       var images = [];
       forEach(isImg ? [element] : element.querySelectorAll('img'), function (image) {
-        if (options.filter) {
-          if (options.filter(image)) {
+        if (isFunction(options.filter)) {
+          if (options.filter.call(_this8, image)) {
             images.push(image);
           }
-        } else {
+        } else if (_this8.getImageURL(image)) {
           images.push(image);
         }
       });
@@ -2692,6 +2689,19 @@
   };
 
   var others = {
+    getImageURL: function getImageURL(image) {
+      var url = this.options.url;
+
+      if (isString(url)) {
+        url = image.getAttribute(url);
+      } else if (isFunction(url)) {
+        url = url.call(this, image);
+      } else {
+        url = '';
+      }
+
+      return url;
+    },
     open: function open() {
       var body = this.body;
       addClass(body, CLASS_OPEN);
@@ -2895,7 +2905,7 @@
             if (options.filter.call(_this, image)) {
               images.push(image);
             }
-          } else if (image.src) {
+          } else if (_this.getImageURL(image)) {
             images.push(image);
           }
         });