Browse Source

Finish adding legacy settings

legacy-modals
Jack Lukic 6 years ago
parent
commit
fa55d1f108
2 changed files with 16 additions and 22 deletions
  1. 22
      src/definitions/modules/dimmer.js
  2. 16
      src/definitions/modules/modal.js

22
src/definitions/modules/dimmer.js

@ -92,7 +92,7 @@ $.fn.dimmer = function(parameters) {
module.bind.events();
module.set.dimmable();
if(!module.can.useFlex()) {
if(!settings.useFlex) {
module.debug('Absolutely positioned flex not supported. Using legacy positioning.');
module.set.legacy();
}
@ -252,7 +252,7 @@ $.fn.dimmer = function(parameters) {
}
$dimmer
.transition({
displayType : module.can.useFlex()
displayType : settings.useFlex
? 'flex'
: 'block',
animation : settings.transition + ' in',
@ -299,7 +299,7 @@ $.fn.dimmer = function(parameters) {
module.verbose('Hiding dimmer with css');
$dimmer
.transition({
displayType : module.can.useFlex()
displayType : settings.useFlex
? 'flex'
: 'block',
animation : settings.transition + ' out',
@ -363,13 +363,6 @@ $.fn.dimmer = function(parameters) {
active: function() {
return $dimmer.hasClass(className.active);
},
ie: function() {
var
isIE11 = (!(window.ActiveXObject) && 'ActiveXObject' in window),
isIE = ('ActiveXObject' in window)
;
return (isIE11 || isIE);
},
animating: function() {
return ( $dimmer.is(':animated') || $dimmer.hasClass(className.animating) );
},
@ -406,9 +399,6 @@ $.fn.dimmer = function(parameters) {
},
can: {
useFlex: function() {
return !module.is.ie();
},
show: function() {
return !$dimmer.hasClass(className.disabled);
}
@ -673,14 +663,14 @@ $.fn.dimmer.settings = {
name : 'Dimmer',
namespace : 'dimmer',
// whether should use flex layout
useFlex : 'auto',
silent : false,
debug : false,
verbose : false,
performance : true,
// whether should use flex layout
useFlex : true,
// name to distinguish between multiple dimmers in context
dimmerName : false,

16
src/definitions/modules/modal.js

@ -107,7 +107,7 @@ $.fn.modal = function(parameters) {
dimmer: function() {
var
defaultSettings = {
flex : settings.flex,
useFlex : module.can.useFlex(),
debug : settings.debug,
variation : settings.centered
? false
@ -342,9 +342,6 @@ $.fn.modal = function(parameters) {
else {
if(settings.allowMultiple && settings.detachable) {
$module.detach().appendTo($dimmer);
}
if(!module.can.useFlex()) {
}
settings.onShow.call(element);
if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
@ -577,7 +574,7 @@ $.fn.modal = function(parameters) {
can: {
useFlex: function() {
return settings.detachable && $dimmer.dimmer('can use flex');
return settings.detachable && !module.is.ie();
},
fit: function() {
var
@ -600,6 +597,13 @@ $.fn.modal = function(parameters) {
active: function() {
return $module.hasClass(className.active);
},
ie: function() {
var
isIE11 = (!(window.ActiveXObject) && 'ActiveXObject' in window),
isIE = ('ActiveXObject' in window)
;
return (isIE11 || isIE);
},
animating: function() {
return $module.transition('is supported')
? $module.transition('is animating')
@ -641,7 +645,6 @@ $.fn.modal = function(parameters) {
var
defaultSettings = {
debug : settings.debug,
useFlex : module.can.useFlex(),
dimmerName : 'modals',
closable : 'auto',
variation : settings.centered
@ -684,6 +687,7 @@ $.fn.modal = function(parameters) {
marginLeft: -(width / 2)
})
;
module.verbose('Setting modal offset for legacy mode');
},
screenHeight: function() {
if( module.can.fit() ) {

Loading…
Cancel
Save