Merge branch 'hotfix/17.8.2'

verlok · May 24, 2022 · a0ba093 · a0ba093
2 parents 46d685d + 59a7a0e
commit a0ba093
Show file tree

Hide file tree

Showing 13 changed files with 87 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Version 17
 
+#### 17.8.2
+
+- Fixed a bug which occurred if the network connection went off and on again after a LazyLoad instance was destroyed
+
 #### 17.8.1
 
 - Updated Typescript typings

diff --git a/README.md b/README.md
@@ -175,7 +175,7 @@ Please note that the video poster can be lazily loaded too.
 
 ## 👩‍💻 Getting started - Script
 
-The latest, recommended version of LazyLoad is **17.8.1**.
+The latest, recommended version of LazyLoad is **17.8.2**.
 
 Quickly understand how to upgrade from a previous version reading the [practical upgrade guide](UPGRADE.md).
 
@@ -184,7 +184,7 @@ Quickly understand how to upgrade from a previous version reading the [practical
 The easiest way to use LazyLoad is to include the script from a CDN:
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/vanilla-lazyload@17.8.1/dist/lazyload.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vanilla-lazyload@17.8.2/dist/lazyload.min.js"></script>
 ```
 
 Then, in your javascript code:
@@ -225,7 +225,7 @@ Then include the script.
 ```html
 <script
   async
-  src="https://cdn.jsdelivr.net/npm/vanilla-lazyload@17.8.1/dist/lazyload.min.js"
+  src="https://cdn.jsdelivr.net/npm/vanilla-lazyload@17.8.2/dist/lazyload.min.js"
 ></script>
 ```
 
@@ -259,7 +259,7 @@ Then include the script.
 ```html
 <script
   async
-  src="https://cdn.jsdelivr.net/npm/vanilla-lazyload@17.8.1/dist/lazyload.min.js"
+  src="https://cdn.jsdelivr.net/npm/vanilla-lazyload@17.8.2/dist/lazyload.min.js"
 ></script>
 ```
 

diff --git a/dist/lazyload.amd.js b/dist/lazyload.amd.js
@@ -761,9 +761,18 @@ define(function () { 'use strict';
       return;
     }
 
-    window.addEventListener("online", function () {
+    instance._onlineHandler = function () {
       retryLazyLoad(settings, instance);
-    });
+    };
+
+    window.addEventListener("online", instance._onlineHandler);
+  };
+  var resetOnlineCheck = function resetOnlineCheck(instance) {
+    if (!runningOnBrowser) {
+      return;
+    }
+
+    window.removeEventListener("online", instance._onlineHandler);
   };
 
   var LazyLoad = function LazyLoad(customSettings, elements) {
@@ -797,15 +806,18 @@ define(function () { 'use strict';
       // Observer
       if (this._observer) {
         this._observer.disconnect();
-      } // Clean custom attributes on elements
+      } // Clean handlers
+
 
+      resetOnlineCheck(this); // Clean custom attributes on elements
 
       queryElements(this._settings).forEach(function (element) {
         deleteOriginalAttrs(element);
       }); // Delete all internal props
 
       delete this._observer;
       delete this._settings;
+      delete this._onlineHandler;
       delete this.loadingCount;
       delete this.toLoadCount;
     },

diff --git a/dist/lazyload.amd.min.js b/dist/lazyload.amd.min.js
diff --git a/dist/lazyload.esm.js b/dist/lazyload.esm.js
@@ -697,7 +697,7 @@ const getElementsToLoad = (elements, settings) =>
 
 const retryLazyLoad = (settings, instance) => {
     const errorElements = filterErrorElements(queryElements(settings));
-    errorElements.forEach(element => {
+    errorElements.forEach((element) => {
         removeClass(element, settings.class_error);
         resetStatus(element);
     });
@@ -708,9 +708,17 @@ const setOnlineCheck = (settings, instance) => {
     if (!runningOnBrowser) {
         return;
     }
-    window.addEventListener("online", () => {
+    instance._onlineHandler = () => {
         retryLazyLoad(settings, instance);
-    });
+    };
+    window.addEventListener("online", instance._onlineHandler);
+};
+
+const resetOnlineCheck = (instance) => {
+    if (!runningOnBrowser) {
+        return;
+    }
+    window.removeEventListener("online", instance._onlineHandler);
 };
 
 const LazyLoad = function (customSettings, elements) {
@@ -745,13 +753,16 @@ LazyLoad.prototype = {
         if (this._observer) {
             this._observer.disconnect();
         }
+        // Clean handlers
+        resetOnlineCheck(this);
         // Clean custom attributes on elements
         queryElements(this._settings).forEach((element) => {
             deleteOriginalAttrs(element);
         });
         // Delete all internal props
         delete this._observer;
         delete this._settings;
+        delete this._onlineHandler;
         delete this.loadingCount;
         delete this.toLoadCount;
     },

diff --git a/dist/lazyload.esm.min.js b/dist/lazyload.esm.min.js
diff --git a/dist/lazyload.iife.js b/dist/lazyload.iife.js
@@ -762,9 +762,18 @@ var LazyLoad = (function () {
       return;
     }
 
-    window.addEventListener("online", function () {
+    instance._onlineHandler = function () {
       retryLazyLoad(settings, instance);
-    });
+    };
+
+    window.addEventListener("online", instance._onlineHandler);
+  };
+  var resetOnlineCheck = function resetOnlineCheck(instance) {
+    if (!runningOnBrowser) {
+      return;
+    }
+
+    window.removeEventListener("online", instance._onlineHandler);
   };
 
   var LazyLoad = function LazyLoad(customSettings, elements) {
@@ -798,15 +807,18 @@ var LazyLoad = (function () {
       // Observer
       if (this._observer) {
         this._observer.disconnect();
-      } // Clean custom attributes on elements
+      } // Clean handlers
+
 
+      resetOnlineCheck(this); // Clean custom attributes on elements
 
       queryElements(this._settings).forEach(function (element) {
         deleteOriginalAttrs(element);
       }); // Delete all internal props
 
       delete this._observer;
       delete this._settings;
+      delete this._onlineHandler;
       delete this.loadingCount;
       delete this.toLoadCount;
     },