Skip to content

Issue #36 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wiggin15 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #36 #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions jquery.blockUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
var $el = $(this);
if (fullOpts.ignoreIfBlocked && $el.data('blockUI.isBlocked'))
return;
if (fullOpts.blockCounting)
return;
$el.unblock({ fadeOut: 0 });
});

Expand Down Expand Up @@ -118,6 +120,8 @@
draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded)

theme: false, // set to true to use with jQuery UI themes

blockCounting: false,

// styles for the message when blocking; if you wish to disable
// these and use an external stylesheet then do this in your code:
Expand Down Expand Up @@ -256,6 +260,15 @@
if (opts.ignoreIfBlocked && $(el).data('blockUI.isBlocked'))
return;

if (opts.blockCounting) {
var blockCount = $(el).data('blockUI.blockCount');
if (blockCount == undefined) blockCount = 0;
blockCount++;
$(el).data('blockUI.blockCount', blockCount);
if (blockCount > 1)
return;
}

opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {});
css = $.extend({}, $.blockUI.defaults.css, opts.css || {});
if (opts.onOverlayClick)
Expand Down Expand Up @@ -465,6 +478,16 @@
$el.removeData('blockUI.timeout');
}
opts = $.extend({}, $.blockUI.defaults, opts || {});

if (opts.blockCounting) {
var blockCount = $(el).data('blockUI.blockCount');
if (blockCount == undefined) blockCount = 0;
else blockCount--;
$(el).data('blockUI.blockCount', blockCount);
if (blockCount > 0)
return;
}

bind(0, el, opts); // unbind events

if (opts.onUnblock === null) {
Expand Down