v2.1.5

gasparesganga · Jul 3, 2018 · dd80239 · dd80239
1 parent ecd7bfb
commit dd80239
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## v2.1.5 - 2018-07-03
+### Fixed
+- Toggle LoadingOverlay visibility according to target element
+- Clear orphaned intervals when target element is arbitrary removed from DOM
+
+
+
 ## v2.1.4 - 2018-06-07
 ### Fixed
 - Replaced the `.load()` method with a custom `ajax()` request to load external SVG images in order to prevent conflicts with `ajaxStart()` and `ajaxSend()` event handlers

diff --git a/dist/loadingoverlay.js b/dist/loadingoverlay.js
@@ -1,7 +1,7 @@
 /***************************************************************************************************
 LoadingOverlay - A flexible loading overlay jQuery plugin
     Author          : Gaspare Sganga
-    Version         : 2.1.4
+    Version         : 2.1.5
     License         : MIT
     Documentation   : https://gasparesganga.com/labs/jquery-loading-overlay/
 ***************************************************************************************************/
@@ -217,8 +217,8 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
         settings.minSize        = parseInt(settings.minSize, 10) || 0;
         settings.resizeInterval = parseInt(settings.resizeInterval, 10) || 0;
 
-        var overlay = container.data("loadingoverlay");
-        var data    = _GetData(overlay);
+        var overlay = _GetOverlay(container);
+        var data    = _GetData(container);
         if (data === false) {
             // Init data
             data = $.extend({}, _dataTemplate);
@@ -407,8 +407,8 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
 
     function Hide(container, force){
         container   = $(container);
-        var overlay = container.data("loadingoverlay");
-        var data    = _GetData(overlay);
+        var overlay = _GetOverlay(container);
+        var data    = _GetData(container);
         if (data === false) return;
 
         data.count--;
@@ -427,8 +427,7 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
 
     function Text(container, value){
         container   = $(container);
-        var overlay = container.data("loadingoverlay");
-        var data    = _GetData(overlay);
+        var data    = _GetData(container);
         if (data === false || !data.text) return;
 
         if (value === false) {
@@ -442,8 +441,7 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
 
     function Progress(container, value){
         container   = $(container);
-        var overlay = container.data("loadingoverlay");
-        var data    = _GetData(overlay);
+        var data    = _GetData(container);
         if (data === false || !data.progress) return;
 
         if (value === false) {
@@ -462,8 +460,8 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
 
 
     function _IntervalResize(container, force){
-        var overlay = container.data("loadingoverlay");
-        var data    = _GetData(overlay);
+        var overlay = _GetOverlay(container);
+        var data    = _GetData(container);
         if (data === false) return;
 
         // Overlay
@@ -517,16 +515,26 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
     }
 
 
-    function _GetData(overlay){
-        var data = (typeof overlay === "undefined") ? undefined : overlay.data("loadingoverlay_data");
+    function _GetOverlay(container){
+        return container.data("loadingoverlay");
+    }
+
+    function _GetData(container){
+        var overlay = _GetOverlay(container);
+        var data    = (typeof overlay === "undefined") ? undefined : overlay.data("loadingoverlay_data");
         if (typeof data === "undefined") {
             // Clean DOM
             $(".loadingoverlay").each(function(){
-                var $this = $(this);
-                if (!document.body.contains($this.data("loadingoverlay_data").container[0])) $this.remove();
+                var $this   = $(this);
+                var data    = $this.data("loadingoverlay_data");
+                if (!document.body.contains(data.container[0])) {
+                    if (data.resizeIntervalId) clearInterval(data.resizeIntervalId);
+                    $this.remove();
+                }
             });
             return false;
         } else {
+            overlay.toggle(container.is(":visible"));
             return data;
         }
     }

diff --git a/dist/loadingoverlay.min.js b/dist/loadingoverlay.min.js
diff --git a/dist/loadingoverlay.min.js.map b/dist/loadingoverlay.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gasparesganga-jquery-loading-overlay",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "description": "A flexible loading overlay jQuery plugin",
     "homepage": "https://gasparesganga.com/labs/jquery-loading-overlay/",
     "author": "Gaspare Sganga <[email protected]> (https://gasparesganga.com)",
@@ -28,7 +28,7 @@
         "del": "^3.0.0",
         "gulp": "^4.0.0",
         "gulp-header": "^2.0.5",
-        "gulp-rename": "^1.2.3",
+        "gulp-rename": "^1.3.0",
         "gulp-replace": "^0.6.1",
         "gulp-sourcemaps": "^2.6.4",
         "gulp-uglify": "^3.0.0",

diff --git a/src/loadingoverlay.js b/src/loadingoverlay.js
@@ -1,7 +1,7 @@
 /***************************************************************************************************
 LoadingOverlay - A flexible loading overlay jQuery plugin
     Author          : Gaspare Sganga
-    Version         : 2.1.5dev
+    Version         : 2.1.5
     License         : MIT
     Documentation   : https://gasparesganga.com/labs/jquery-loading-overlay/
 ***************************************************************************************************/