From 1edd7e3a17ed6663f3f5316d8627219dcdee39cc Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 22 Dec 2014 13:06:30 -0500 Subject: [PATCH] Adds dimmer settings #1472, refactors init to use new behavior create dimmer --- src/definitions/modules/modal.js | 79 ++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js index f5ffa5a9a..4833f0ed5 100644 --- a/src/definitions/modules/modal.js +++ b/src/definitions/modules/modal.js @@ -77,24 +77,13 @@ $.fn.modal = function(parameters) { module.verbose('Initializing dimmer', $context); module.create.id(); + module.create.dimmer(); if($.fn.dimmer === undefined) { module.error(error.dimmer); return; } - $dimmable = $context - .dimmer({ - debug : settings.debug, - dimmerName : 'modals', - closable : false, - useCSS : true, - duration : { - show : settings.duration, - hide : settings.duration - } - }) - ; if(settings.detachable) { $dimmable.dimmer('add content', $module); @@ -118,6 +107,23 @@ $.fn.modal = function(parameters) { }, create: { + dimmer: function() { + var + defaultSettings = { + debug : settings.debug, + dimmerName : 'modals', + duration : { + show : settings.duration, + hide : settings.duration + } + }, + dimmerSettings = $.extend(true, defaultSettings, settings.dimmerSettings) + ; + module.debug('Creating dimmer with settings', dimmerSettings); + $dimmable = $context + .dimmer(dimmerSettings) + ; + }, id: function() { module.verbose('Creating unique id for element'); id = module.get.uniqueID(); @@ -801,36 +807,41 @@ $.fn.modal = function(parameters) { $.fn.modal.settings = { - name : 'Modal', - namespace : 'modal', + name : 'Modal', + namespace : 'modal', - debug : false, - verbose : true, - performance : true, + debug : false, + verbose : true, + performance : true, - allowMultiple : false, - detachable : true, - closable : true, - autofocus : true, + allowMultiple : false, + detachable : true, + closable : true, + autofocus : true, + + dimmerSettings : { + closable : false, + useCSS : true + }, - context : 'body', + context : 'body', - queue : false, - duration : 500, - easing : 'easeOutExpo', - offset : 0, - transition : 'scale', + queue : false, + duration : 500, + easing : 'easeOutExpo', + offset : 0, + transition : 'scale', - padding : 30, + padding : 30, - onShow : function(){}, - onHide : function(){}, + onShow : function(){}, + onHide : function(){}, - onVisible : function(){}, - onHidden : function(){}, + onVisible : function(){}, + onHidden : function(){}, - onApprove : function(){ return true; }, - onDeny : function(){ return true; }, + onApprove : function(){ return true; }, + onDeny : function(){ return true; }, selector : { close : '.close, .actions .button',