diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js index 4f8c30fc02..2e58ba3f2b 100644 --- a/src/definitions/modules/modal.js +++ b/src/definitions/modules/modal.js @@ -250,16 +250,21 @@ $.fn.modal = function(parameters) { isInDOM = $.contains(document.documentElement, event.target) ; if(!isInModal && isInDOM) { - module.debug('Dimmer clicked, hiding all modals'); - if( module.is.active() ) { - module.remove.clickaway(); - if(settings.allowMultiple) { - module.hide(); - } - else { - module.hideAll(); + if(settings.closable) { + module.debug('Dimmer clicked, hiding all modals'); + if( module.is.active() ) { + module.remove.clickaway(); + if(settings.allowMultiple) { + module.hide(); + } + else { + module.hideAll(); + } } } + else { + module.debug('Dimmer clicked, but closable is set to false'); + } } }, debounce: function(method, delay) { @@ -502,11 +507,9 @@ $.fn.modal = function(parameters) { $module.removeClass(className.active); }, clickaway: function() { - if(settings.closable) { - $dimmer - .off('click' + elementEventNamespace) - ; - } + $dimmer + .off('click' + elementNamespace) + ; }, bodyStyle: function() { if($body.attr('style') === '') { @@ -587,11 +590,9 @@ $.fn.modal = function(parameters) { } }, clickaway: function() { - if(settings.closable) { - $dimmer - .on('click' + elementEventNamespace, module.event.click) - ; - } + $dimmer + .on('click' + elementNamespace, module.event.click) + ; }, screenHeight: function() { if( module.can.fit() ) {