Toggle LoadingOverlay visibility according to target element

Fixes #35
gasparesganga · Jul 3, 2018 · ff40900 · ff40900
1 parent 8eda5b0
commit ff40900
Showing 1 changed file with 17 additions and 13 deletions.
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.4
+    Version         : 2.1.5dev
     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,8 +515,13 @@ 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(){
@@ -527,6 +530,7 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
             });
             return false;
         } else {
+            overlay.toggle(container.is(":visible"));
             return data;
         }
     }