Browse Source

Fix transition sometimes keeping inline style unnecesarily

pull/1378/head
jlukic 10 years ago
parent
commit
30e6cb3cc2
1 changed files with 9 additions and 1 deletions
  1. 10
      src/definitions/modules/transition.js

10
src/definitions/modules/transition.js

@ -209,6 +209,12 @@ $.fn.transition = function() {
return true; return true;
} }
return false; return false;
},
inlineDisplay: function() {
var
style = $module.attr('style') || ''
;
return $.isArray(style.match(/display.*?;/, ''));
} }
}, },
@ -259,8 +265,10 @@ $.fn.transition = function() {
var var
style = module.get.style(), style = module.get.style(),
displayType = module.get.displayType(), displayType = module.get.displayType(),
hasInlineDisplay = module.has.inlineDisplay(),
overrideStyle = style + 'display: ' + displayType + ' !important;' overrideStyle = style + 'display: ' + displayType + ' !important;'
; ;
$module.css('display', '');
module.refresh(); module.refresh();
if( $module.css('display') !== displayType ) { if( $module.css('display') !== displayType ) {
module.verbose('Setting inline visibility to', displayType); module.verbose('Setting inline visibility to', displayType);
@ -484,7 +492,7 @@ $.fn.transition = function() {
}, },
style: function() { style: function() {
var var
style = $module.attr('style') || ''
style = $module.attr('style') || ''
; ;
return style.replace(/display.*?;/, ''); return style.replace(/display.*?;/, '');
}, },

Loading…
Cancel
Save