git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.bind() now accepts an optional thisObject as the last argument which is used to...
[jquery.git]
/
src
/
fx.js
diff --git
a/src/fx.js
b/src/fx.js
index
45c2389
..
220b88a
100644
(file)
--- a/
src/fx.js
+++ b/
src/fx.js
@@
-24,26
+24,26
@@
jQuery.fn.extend({
} else {
for ( var i = 0, l = this.length; i < l; i++ ){
var old = jQuery.data(this[i], "olddisplay");
} else {
for ( var i = 0, l = this.length; i < l; i++ ){
var old = jQuery.data(this[i], "olddisplay");
-
+
this[i].style.display = old || "";
this[i].style.display = old || "";
-
+
if ( jQuery.css(this[i], "display") === "none" ) {
var tagName = this[i].tagName, display;
if ( jQuery.css(this[i], "display") === "none" ) {
var tagName = this[i].tagName, display;
-
+
if ( elemdisplay[ tagName ] ) {
display = elemdisplay[ tagName ];
} else {
var elem = jQuery("<" + tagName + " />").appendTo("body");
if ( elemdisplay[ tagName ] ) {
display = elemdisplay[ tagName ];
} else {
var elem = jQuery("<" + tagName + " />").appendTo("body");
-
+
display = elem.css("display");
if ( display === "none" )
display = "block";
display = elem.css("display");
if ( display === "none" )
display = "block";
-
+
elem.remove();
elem.remove();
-
+
elemdisplay[ tagName ] = display;
}
elemdisplay[ tagName ] = display;
}
-
+
jQuery.data(this[i], "olddisplay", display);
}
}
jQuery.data(this[i], "olddisplay", display);
}
}
@@
-53,7
+53,7
@@
jQuery.fn.extend({
for ( var i = 0, l = this.length; i < l; i++ ){
this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
}
for ( var i = 0, l = this.length; i < l; i++ ){
this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
}
-
+
return this;
}
},
return this;
}
},
@@
-103,11
+103,11
@@
jQuery.fn.extend({
var optall = jQuery.speed(speed, easing, callback);
return this[ optall.queue === false ? "each" : "queue" ](function(){
var optall = jQuery.speed(speed, easing, callback);
return this[ optall.queue === false ? "each" : "queue" ](function(){
-
+
var opt = jQuery.extend({}, optall), p,
hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
self = this;
var opt = jQuery.extend({}, optall), p,
hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
self = this;
-
+
for ( p in prop ) {
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return opt.complete.call(this);
for ( p in prop ) {
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return opt.complete.call(this);
@@
-305,7
+305,7
@@
jQuery.fx.prototype = {
// Simple 'show' function
show: function(){
// Remember where we started, so that we can go back to it later
// Simple 'show' function
show: function(){
// Remember where we started, so that we can go back to it later
- this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+ this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
this.options.show = true;
// Begin the animation
this.options.show = true;
// Begin the animation
@@
-320,7
+320,7
@@
jQuery.fx.prototype = {
// Simple 'hide' function
hide: function(){
// Remember where we started, so that we can go back to it later
// Simple 'hide' function
hide: function(){
// Remember where we started, so that we can go back to it later
- this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+ this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
this.options.hide = true;
// Begin the animation
this.options.hide = true;
// Begin the animation
@@
-361,8
+361,8
@@
jQuery.fx.prototype = {
// Reset the properties, if the item has been hidden or shown
if ( this.options.hide || this.options.show )
for ( var p in this.options.curAnim )
// Reset the properties, if the item has been hidden or shown
if ( this.options.hide || this.options.show )
for ( var p in this.options.curAnim )
- jQuery.attr(this.elem.style, p, this.options.orig[p]);
-
+ jQuery.style(this.elem, p, this.options.orig[p]);
+
// Execute the complete function
this.options.complete.call( this.elem );
}
// Execute the complete function
this.options.complete.call( this.elem );
}
@@
-395,7
+395,7
@@
jQuery.extend( jQuery.fx, {
step: {
opacity: function(fx){
step: {
opacity: function(fx){
- jQuery.attr(fx.elem.style, "opacity", fx.now);
+ jQuery.style(fx.elem, "opacity", fx.now);
},
_default: function(fx){
},
_default: function(fx){