Browse Source

#2042 addes delegated events to dimmer

pull/2053/head
jlukic 10 years ago
parent
commit
cd4cced83a
1 changed files with 22 additions and 25 deletions
  1. 47
      src/definitions/modules/dimmer.js

47
src/definitions/modules/dimmer.js

@ -67,10 +67,10 @@ $.fn.dimmer = function(parameters) {
$dimmable = $module; $dimmable = $module;
if( module.has.dimmer() ) { if( module.has.dimmer() ) {
if(settings.dimmerName) { if(settings.dimmerName) {
$dimmer = $dimmable.children(selector.dimmer).filter('.' + settings.dimmerName); $dimmer = $dimmable.find(selector.dimmer).filter('.' + settings.dimmerName);
} }
else { else {
$dimmer = $dimmable.children(selector.dimmer); $dimmer = $dimmable.find(selector.dimmer);
} }
} }
else { else {
@ -99,8 +99,8 @@ $.fn.dimmer = function(parameters) {
if( module.is.closable() ) { if( module.is.closable() ) {
module.verbose('Adding dimmer close event', $dimmer); module.verbose('Adding dimmer close event', $dimmer);
$dimmer $dimmable
.on(clickEvent + eventNamespace, module.event.click) .on(clickEvent + eventNamespace, selector.dimmer, module.event.click)
; ;
} }
module.set.dimmable(); module.set.dimmable();
@ -123,9 +123,6 @@ $.fn.dimmer = function(parameters) {
$dimmable $dimmable
.off(eventNamespace) .off(eventNamespace)
; ;
$dimmer
.off(eventNamespace)
;
}, },
event: { event: {
@ -313,10 +310,10 @@ $.fn.dimmer = function(parameters) {
has: { has: {
dimmer: function() { dimmer: function() {
if(settings.dimmerName) { if(settings.dimmerName) {
return ($module.children(selector.dimmer).filter('.' + settings.dimmerName).length > 0); return ($module.find(selector.dimmer).filter('.' + settings.dimmerName).length > 0);
} }
else { else {
return ( $module.children(selector.dimmer).length > 0 ); return ( $module.find(selector.dimmer).length > 0 );
} }
} }
}, },
@ -338,10 +335,10 @@ $.fn.dimmer = function(parameters) {
return settings.closable; return settings.closable;
}, },
dimmer: function() { dimmer: function() {
return $module.is(selector.dimmer); return $module.hasClass(className.dimmer);
}, },
dimmable: function() { dimmable: function() {
return $module.is(selector.dimmable); return $module.hasClass(className.dimmable);
}, },
dimmed: function() { dimmed: function() {
return $dimmable.hasClass(className.dimmed); return $dimmable.hasClass(className.dimmed);
@ -602,8 +599,8 @@ $.fn.dimmer.settings = {
name : 'Dimmer', name : 'Dimmer',
namespace : 'dimmer', namespace : 'dimmer',
debug : false, debug : true,
verbose : false, verbose : true,
performance : true, performance : true,
// name to distinguish between multiple dimmers in context // name to distinguish between multiple dimmers in context
@ -641,27 +638,27 @@ $.fn.dimmer.settings = {
method : 'The method you called is not defined.' method : 'The method you called is not defined.'
}, },
selector: {
dimmable : '.dimmable',
dimmer : '.ui.dimmer',
content : '.ui.dimmer > .content, .ui.dimmer > .content > .center'
},
template: {
dimmer: function() {
return $('<div />').attr('class', 'ui dimmer');
}
},
className : { className : {
active : 'active', active : 'active',
animating : 'animating', animating : 'animating',
dimmable : 'dimmable', dimmable : 'dimmable',
dimmed : 'dimmed', dimmed : 'dimmed',
dimmer : 'ui dimmer',
disabled : 'disabled', disabled : 'disabled',
hide : 'hide', hide : 'hide',
pageDimmer : 'page', pageDimmer : 'page',
show : 'show' show : 'show'
},
selector: {
dimmer : '> .ui.dimmer',
content : '.ui.dimmer > .content, .ui.dimmer > .content > .center'
},
template: {
dimmer: function() {
return $('<div />').attr('class', 'ui dimmer');
}
} }
}; };

|||||||
100:0
Loading…
Cancel
Save