From 3085d77332a0bb4984711af59546eafd23236fdd Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 28 Oct 2013 15:06:23 -0400 Subject: [PATCH] Fixes #289 issue with ie and modals --- src/modules/dimmer.js | 6 ++++-- src/modules/modal.js | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/modules/dimmer.js b/src/modules/dimmer.js index 2070342c0..586368c89 100755 --- a/src/modules/dimmer.js +++ b/src/modules/dimmer.js @@ -155,7 +155,7 @@ $.fn.dimmer = function(parameters) { : function(){} ; module.set.dimmed(); - if($.fn.transition !== undefined) { + if($.fn.transition !== undefined && settings.useCSS) { $dimmer .transition({ animation : settings.transition + ' in', @@ -190,7 +190,7 @@ $.fn.dimmer = function(parameters) { ? callback : function(){} ; - if($.fn.transition !== undefined) { + if($.fn.transition !== undefined && settings.useCSS) { module.verbose('Hiding dimmer with css'); $dimmer .transition({ @@ -548,8 +548,10 @@ $.fn.dimmer.settings = { performance : true, transition : 'fade', + useCSS : true, on : false, closable : true, + duration : { show : 500, hide : 500 diff --git a/src/modules/modal.js b/src/modules/modal.js index b6919e6a3..3d965bcd7 100755 --- a/src/modules/modal.js +++ b/src/modules/modal.js @@ -71,6 +71,7 @@ $.fn.modal = function(parameters) { $dimmable = $context .dimmer({ closable : false, + useCSS : false, show : settings.duration * 0.95, hide : settings.duration * 1.05 }) @@ -571,8 +572,9 @@ $.fn.modal.settings = { name : 'Modal', namespace : 'modal', - verbose : true, + debug : true, + verbose : true, performance : true, closable : true,