Browse Source

Modal now uses requestAnimationFrame, properly detects for dimmer dependency

pull/669/merge
jlukic 11 years ago
parent
commit
71e6d3c49c
1 changed files with 6 additions and 8 deletions
  1. 14
      src/modules/modal.js

14
src/modules/modal.js

@ -1,6 +1,6 @@
/* /*
* # Semantic - Modal * # Semantic - Modal
* http://github.com/jlukic/semantic-ui/
* http://github.com/semantic-org/semantic-ui/
* *
* *
* Copyright 2013 Contributors * Copyright 2013 Contributors
@ -65,7 +65,7 @@ $.fn.modal = function(parameters) {
initialize: function() { initialize: function() {
module.verbose('Initializing dimmer', $context); module.verbose('Initializing dimmer', $context);
if(typeof $.fn.dimmer === undefined) {
if($.fn.dimmer === undefined) {
module.error(error.dimmer); module.error(error.dimmer);
return; return;
} }
@ -73,7 +73,7 @@ $.fn.modal = function(parameters) {
.dimmer({ .dimmer({
closable : false, closable : false,
useCSS : true, useCSS : true,
duration: {
duration : {
show : settings.duration * 0.9, show : settings.duration * 0.9,
hide : settings.duration * 1.1 hide : settings.duration * 1.1
} }
@ -96,9 +96,7 @@ $.fn.modal = function(parameters) {
.on('click' + eventNamespace, module.event.close) .on('click' + eventNamespace, module.event.close)
; ;
$window $window
.on('resize' + eventNamespace, function() {
module.event.debounce(module.refresh, 50);
})
.on('resize' + eventNamespace, module.event.resize)
; ;
module.instantiate(); module.instantiate();
}, },
@ -210,7 +208,7 @@ $.fn.modal = function(parameters) {
}, },
resize: function() { resize: function() {
if( $dimmable.dimmer('is active') ) { if( $dimmable.dimmer('is active') ) {
module.refresh();
requestAnimationFrame(module.refresh);
} }
} }
}, },
@ -728,4 +726,4 @@ $.fn.modal.settings = {
}; };
})( jQuery, window , document );
})( jQuery, window , document );
Loading…
Cancel
Save