Skip to content

Commit dd80239

Browse files
author
Gaspare Sganga
committed
v2.1.5
1 parent ecd7bfb commit dd80239

File tree

7 files changed

+40
-25
lines changed

7 files changed

+40
-25
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

77

8+
## v2.1.5 - 2018-07-03
9+
### Fixed
10+
- Toggle LoadingOverlay visibility according to target element
11+
- Clear orphaned intervals when target element is arbitrary removed from DOM
12+
13+
14+
815
## v2.1.4 - 2018-06-07
916
### Fixed
1017
- 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

dist/loadingoverlay.js

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/***************************************************************************************************
22
LoadingOverlay - A flexible loading overlay jQuery plugin
33
Author : Gaspare Sganga
4-
Version : 2.1.4
4+
Version : 2.1.5
55
License : MIT
66
Documentation : https://gasparesganga.com/labs/jquery-loading-overlay/
77
***************************************************************************************************/
@@ -217,8 +217,8 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
217217
settings.minSize = parseInt(settings.minSize, 10) || 0;
218218
settings.resizeInterval = parseInt(settings.resizeInterval, 10) || 0;
219219

220-
var overlay = container.data("loadingoverlay");
221-
var data = _GetData(overlay);
220+
var overlay = _GetOverlay(container);
221+
var data = _GetData(container);
222222
if (data === false) {
223223
// Init data
224224
data = $.extend({}, _dataTemplate);
@@ -407,8 +407,8 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
407407

408408
function Hide(container, force){
409409
container = $(container);
410-
var overlay = container.data("loadingoverlay");
411-
var data = _GetData(overlay);
410+
var overlay = _GetOverlay(container);
411+
var data = _GetData(container);
412412
if (data === false) return;
413413

414414
data.count--;
@@ -427,8 +427,7 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
427427

428428
function Text(container, value){
429429
container = $(container);
430-
var overlay = container.data("loadingoverlay");
431-
var data = _GetData(overlay);
430+
var data = _GetData(container);
432431
if (data === false || !data.text) return;
433432

434433
if (value === false) {
@@ -442,8 +441,7 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
442441

443442
function Progress(container, value){
444443
container = $(container);
445-
var overlay = container.data("loadingoverlay");
446-
var data = _GetData(overlay);
444+
var data = _GetData(container);
447445
if (data === false || !data.progress) return;
448446

449447
if (value === false) {
@@ -462,8 +460,8 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
462460

463461

464462
function _IntervalResize(container, force){
465-
var overlay = container.data("loadingoverlay");
466-
var data = _GetData(overlay);
463+
var overlay = _GetOverlay(container);
464+
var data = _GetData(container);
467465
if (data === false) return;
468466

469467
// Overlay
@@ -517,16 +515,26 @@ LoadingOverlay - A flexible loading overlay jQuery plugin
517515
}
518516

519517

520-
function _GetData(overlay){
521-
var data = (typeof overlay === "undefined") ? undefined : overlay.data("loadingoverlay_data");
518+
function _GetOverlay(container){
519+
return container.data("loadingoverlay");
520+
}
521+
522+
function _GetData(container){
523+
var overlay = _GetOverlay(container);
524+
var data = (typeof overlay === "undefined") ? undefined : overlay.data("loadingoverlay_data");
522525
if (typeof data === "undefined") {
523526
// Clean DOM
524527
$(".loadingoverlay").each(function(){
525-
var $this = $(this);
526-
if (!document.body.contains($this.data("loadingoverlay_data").container[0])) $this.remove();
528+
var $this = $(this);
529+
var data = $this.data("loadingoverlay_data");
530+
if (!document.body.contains(data.container[0])) {
531+
if (data.resizeIntervalId) clearInterval(data.resizeIntervalId);
532+
$this.remove();
533+
}
527534
});
528535
return false;
529536
} else {
537+
overlay.toggle(container.is(":visible"));
530538
return data;
531539
}
532540
}

dist/loadingoverlay.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/loadingoverlay.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gasparesganga-jquery-loading-overlay",
3-
"version": "2.1.4",
3+
"version": "2.1.5",
44
"description": "A flexible loading overlay jQuery plugin",
55
"homepage": "https://gasparesganga.com/labs/jquery-loading-overlay/",
66
"author": "Gaspare Sganga <[email protected]> (https://gasparesganga.com)",
@@ -28,7 +28,7 @@
2828
"del": "^3.0.0",
2929
"gulp": "^4.0.0",
3030
"gulp-header": "^2.0.5",
31-
"gulp-rename": "^1.2.3",
31+
"gulp-rename": "^1.3.0",
3232
"gulp-replace": "^0.6.1",
3333
"gulp-sourcemaps": "^2.6.4",
3434
"gulp-uglify": "^3.0.0",

src/loadingoverlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/***************************************************************************************************
22
LoadingOverlay - A flexible loading overlay jQuery plugin
33
Author : Gaspare Sganga
4-
Version : 2.1.5dev
4+
Version : 2.1.5
55
License : MIT
66
Documentation : https://gasparesganga.com/labs/jquery-loading-overlay/
77
***************************************************************************************************/

0 commit comments

Comments
 (0)