diff options
| author | Felix Nagel <info@felixnagel.com> | 2011-10-09 00:14:03 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2011-10-09 00:14:03 +0200 |
| commit | ac54556fb3b7ab08744cc7ea663a276d5c91cdd4 (patch) | |
| tree | 22fddadf4753d0e2bce4fc9528b9e1cc7cb342d8 /ui/jquery.effects.core.js | |
| parent | d7e23ce225b6fe08cfa779df0f7e70e4d95a0883 (diff) | |
| parent | 647bab506e288658c8a28dab1083c657ad61951e (diff) | |
| download | jquery-ui-ac54556fb3b7ab08744cc7ea663a276d5c91cdd4.tar.gz jquery-ui-ac54556fb3b7ab08744cc7ea663a276d5c91cdd4.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui into selectmenu
Diffstat (limited to 'ui/jquery.effects.core.js')
| -rw-r--r-- | ui/jquery.effects.core.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 15d81b4b0..3dc0a4e67 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -161,7 +161,7 @@ var classAnimationActions = [ "add", "remove", "toggle" ], // prefix used for storing data on .data() dataSpace = "ec.storage."; -$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function(_, prop) { +$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) { $.fx.step[ prop ] = function( fx ) { if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) { jQuery.style( fx.elem, prop, fx.end ); @@ -171,8 +171,8 @@ $.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopS }); function getElementStyles() { - var style = document.defaultView - ? document.defaultView.getComputedStyle(this, null) + var style = this.ownerDocument.defaultView + ? this.ownerDocument.defaultView.getComputedStyle( this, null ) : this.currentStyle, newStyle = {}, key, @@ -223,7 +223,7 @@ $.effects.animateClass = function( value, duration, easing, callback ) { return this.queue( function() { var animated = $( this ), - baseClass = animated.attr( "class" ), + baseClass = animated.attr( "class" ) || "", finalClass, allAnimations = o.children ? animated.find( "*" ).andSelf() : animated; |