r2417 - fixed style properties with multiple integers in IE (for example padding)
Author: a.farkas.pm
Date: Mon Mar 30 23:49:39 2009
New Revision: 2417
Modified:
branches/dev/effects/tests/visual/animateClass/index.html
branches/dev/effects/ui/effects.core.js
Log:
fixed style properties with multiple integers in IE (for example padding)
Modified: branches/dev/effects/tests/visual/animateClass/index.html
==============================================================================
--- branches/dev/effects/tests/visual/animateClass/index.html (original)
+++ branches/dev/effects/tests/visual/animateClass/index.html Mon Mar 30
23:49:39 2009
@@ -30,7 +30,7 @@
-moz-border-radius: 9px;
-webkit-border-radius: 9px;
width: 300px;
- padding: 30px;
+ padding: 10px 20px;
}
div.inner-box{
border: 5px solid #000;
Modified: branches/dev/effects/ui/effects.core.js
==============================================================================
--- branches/dev/effects/ui/effects.core.js (original)
+++ branches/dev/effects/ui/effects.core.js Mon Mar 30 23:49:39 2009
@@ -210,7 +210,8 @@
opts[i].animateStyles[n] = opts[i].element[n]();
} else if(n == 'filter' &&
opts[i].newStyle[n].indexOf('opacity=') !== -1){ // handle filter opacity
opts[i].animateStyles.opacity =
parseInt(opts[i].newStyle[n].match(/opacity=([^)]*)/)[1], 10) / 100;
- } else if ((!isNaN(parseInt(opts[i].newStyle[n], 10)) &&
opts[i].newStyle[n].match(/\s|,/) === null) ||
+ } else if (( !isNaN(parseInt(opts[i].newStyle[n], 10)) &&
opts[i].newStyle[n].match(/\s|,/) === null &&
+ !isNaN(parseInt(oldStyle[i][n], 10)) && oldStyle[i][n].match(/\s|,/)
=== null) ||
($.fx.step[n] && !blacklistValues[opts[i].newStyle[n]])) /* Only
things that can be parsed to integers or we have a animate-Plugin for this
*/ {
opts[i].animateStyles[n] = opts[i].newStyle[n];
}