Skip to content
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

Jump to bottom

pass event to disableOn handler #1017

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

pass event to disableOn handler #1017

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions dist/jquery.magnific-popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ MagnificPopup.prototype = {

if(disableOn) {
if($.isFunction(disableOn)) {
if( !disableOn.call(mfp) ) {
if( !disableOn.call(mfp, e) ) {
return true;
}
} else { // else it's number
Expand Down Expand Up @@ -1857,4 +1857,4 @@ $.magnificPopup.registerModule(RETINA_NS, {
});

/*>>retina*/
_checkInstance(); }));
_checkInstance(); }));
4 changes: 2 additions & 2 deletions src/js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ MagnificPopup.prototype = {

if(disableOn) {
if($.isFunction(disableOn)) {
if( !disableOn.call(mfp) ) {
if( !disableOn.call(mfp, e) ) {
return true;
}
} else { // else it's number
Expand Down Expand Up @@ -936,4 +936,4 @@ $.fn.magnificPopup = function(options) {

}
return jqEl;
};
};
2 changes: 1 addition & 1 deletion website/documentation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ If window width is less than the number in this option lightbox will not be open
Can also accept Function as a parameter, which should return `true` if lightbox can be opened and `false` otherwise. For example:

{% highlight javascript %}
disableOn: function() {
disableOn: function(e) {
if( $(window).width() < 600 ) {
return false;
}
Expand Down