git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split apart jQuery.css into jQuery.css (computed values) and jQuery.style (currently...
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
130b676
..
eeab9b7
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-3,6
+3,7
@@
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
var elemdisplay = {},
rfxtypes = /toggle|show|hide/,
rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+ rdashAlpha = /-([a-z])/ig,
timerId,
fxAttrs = [
// height animations
timerId,
fxAttrs = [
// height animations
@@
-11,7
+12,11
@@
var elemdisplay = {},
[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
// opacity animations
[ "opacity" ]
[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
// opacity animations
[ "opacity" ]
- ];
+ ],
+
+ fcamelCase = function( all, letter ) {
+ return letter.toUpperCase();
+ };
jQuery.fn.extend({
show: function( speed, callback ) {
jQuery.fn.extend({
show: function( speed, callback ) {
@@
-24,7
+29,7
@@
jQuery.fn.extend({
this[i].style.display = old || "";
this[i].style.display = old || "";
- if ( jQuery.css(this[i], "display") === "none" ) {
+ if ( jQuery.css( this[i], "display" ) === "none" ) {
var nodeName = this[i].nodeName, display;
if ( elemdisplay[ nodeName ] ) {
var nodeName = this[i].nodeName, display;
if ( elemdisplay[ nodeName ] ) {
@@
-66,7
+71,7
@@
jQuery.fn.extend({
for ( var i = 0, l = this.length; i < l; i++ ) {
var old = jQuery.data(this[i], "olddisplay");
if ( !old && old !== "none" ) {
for ( var i = 0, l = this.length; i < l; i++ ) {
var old = jQuery.data(this[i], "olddisplay");
if ( !old && old !== "none" ) {
- jQuery.data( this[i], "olddisplay", jQuery.css(this[i], "display") );
+ jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
}
}
}
}
@@
-134,7
+139,7
@@
jQuery.fn.extend({
if ( ( p === "height" || p === "width" ) && this.style ) {
// Store display property
if ( ( p === "height" || p === "width" ) && this.style ) {
// Store display property
- opt.display = jQuery.css(this, "display");
+ opt.display = this.style.display;
// Make sure that nothing sneaks out
opt.overflow = this.style.overflow;
// Make sure that nothing sneaks out
opt.overflow = this.style.overflow;
@@
-311,13
+316,13
@@
jQuery.fx.prototype = {
},
// Get the current size
},
// Get the current size
- cur: function( force ) {
+ cur: function() {
if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
return this.elem[ this.prop ];
}
if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
return this.elem[ this.prop ];
}
- var r = parseFloat(jQuery.css(this.elem, this.prop, undefined, force));
- return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+ var r = jQuery.css( this.elem, this.prop );
+ return r && r > -10000 ? r : 0;
},
// Start an animation from one number to another
},
// Start an animation from one number to another
@@
-344,7
+349,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.css( this.elem, 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
@@
-359,7
+364,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.css( this.elem, 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
@@
-392,7
+397,7
@@
jQuery.fx.prototype = {
var old = jQuery.data(this.elem, "olddisplay");
this.elem.style.display = old ? old : this.options.display;
var old = jQuery.data(this.elem, "olddisplay");
this.elem.style.display = old ? old : this.options.display;
- if ( jQuery.css(this.elem, "display") === "none" ) {
+ if ( jQuery.css( this.elem, "display" ) === "none" ) {
this.elem.style.display = "block";
}
}
this.elem.style.display = "block";
}
}
@@
-405,7
+410,7
@@
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.css( this.elem, p, this.options.orig[p] );
+ jQuery.style( this.elem, p, this.options.orig[p] );
}
}
}
}
@@
-462,7
+467,7
@@
jQuery.extend( jQuery.fx, {
step: {
opacity: function( fx ) {
step: {
opacity: function( fx ) {
- jQuery.css( fx.elem, "opacity", fx.now );
+ jQuery.style( fx.elem, "opacity", fx.now );
},
_default: function( fx ) {
},
_default: function( fx ) {