Skip to content

New request for an overlay to be displayed is not ignored while close animation is running #3

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

Merged
larister merged 1 commit into from
Oct 29, 2015
Merged

New request for an overlay to be displayed is not ignored while close animation is running #3

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
15 changes: 12 additions & 3 deletions src/toolbox/toolbox.expose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,22 @@
if (fn) { return fn.call($.mask); }
}

var mask, exposed, loaded, config, overlayIndex;
var mask, exposed, loaded, config, overlayIndex,
closingNow = false;
Copy link

@larister larister Oct 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nabd but in future just change this to be multivar declarations.

i.e.

var mask;
var exposed;

etc

Copy link

@larister larister Oct 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I think isClosing is a better name



$.mask = {

load: function(conf, els) {

if (closingNow && mask) {
// this calls the fadeOut callback
// and sets closingNow to false
mask.finish();
}

// already loaded ?
if (loaded) { return this; }
if (loaded) { return this; }

// configuration
if (typeof conf == 'string') {
Expand Down Expand Up @@ -169,11 +176,13 @@
// onBeforeClose
if (call(config.onBeforeClose) === false) { return this; }

closingNow = true;
mask.fadeOut(config.closeSpeed, function() {
call(config.onClose);
if (exposed) {
exposed.css({zIndex: overlayIndex});
}
}
closingNow = false;
loaded = false;
});

Expand Down