Browse Source

Fixes #289 issue with ie and modals

pull/291/head
jlukic 11 years ago
parent
commit
3085d77332
2 changed files with 7 additions and 3 deletions
  1. 6
      src/modules/dimmer.js
  2. 4
      src/modules/modal.js

6
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

4
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,

Loading…
Cancel
Save