diff --git a/src/modules/dimmer.js b/src/modules/dimmer.js index 152394328..4fb3fffb5 100755 --- a/src/modules/dimmer.js +++ b/src/modules/dimmer.js @@ -54,6 +54,8 @@ $.fn.dimmer = function(parameters) { module ; + console.log(element, parameters); + module = { preinitialize: function() { diff --git a/src/modules/modal.js b/src/modules/modal.js index 79ae112d7..25947946b 100755 --- a/src/modules/modal.js +++ b/src/modules/modal.js @@ -64,9 +64,14 @@ $.fn.modal = function(parameters) { module.verbose('Initializing dimmer', $context); $dimmable = $context + .dimmer({ + closable : false, + show : settings.duration * 0.95, + hide : settings.duration * 1.05 + }) .dimmer('add content', $module) ; - $dimmer = $context + $dimmer = $dimmable .dimmer('get dimmer') ; @@ -201,7 +206,6 @@ $.fn.modal = function(parameters) { showDimmer: function() { module.debug('Showing modal'); - module.set.dimmerSettings(); $dimmable.dimmer('show'); }, @@ -331,16 +335,6 @@ $.fn.modal = function(parameters) { ; } }, - dimmerSettings: function() { - module.debug('Setting dimmer settings', $dimmable); - $dimmable - .dimmer({ - closable: false, - show: settings.duration * 0.95, - hide: settings.duration * 1.05 - }) - ; - }, scrolling: function() { $dimmable.addClass(className.scrolling); $module.addClass(className.scrolling);