git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When a native browser event is bubbling up the DOM, make sure that the correct isDefa...
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
b73aa72
..
6007074
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-2,7
+2,7
@@
var elemdisplay = {},
rfxtypes = /^(?:toggle|show|hide)$/,
var elemdisplay = {},
rfxtypes = /^(?:toggle|show|hide)$/,
- rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+ rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
timerId,
fxAttrs = [
// height animations
timerId,
fxAttrs = [
// height animations
@@
-28,7
+28,7
@@
jQuery.fn.extend({
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
- elem.style.display = "";
+ display = elem.style.display = "";
}
// Set elements which have been overridden with display: none
}
// Set elements which have been overridden with display: none
@@
-61,8
+61,8
@@
jQuery.fn.extend({
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" );
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" );
-
- if ( display !== "none" ) {
+
+ if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
jQuery.data( this[i], "olddisplay", display );
}
}
jQuery.data( this[i], "olddisplay", display );
}
}
@@
-112,7
+112,7
@@
jQuery.fn.extend({
}
return this[ optall.queue === false ? "each" : "queue" ](function() {
}
return this[ optall.queue === false ? "each" : "queue" ](function() {
- // XXX ‘this’ does not always have a nodeName when running the
+ // XXX 'this' does not always have a nodeName when running the
// test suite
var opt = jQuery.extend({}, optall), p,
// test suite
var opt = jQuery.extend({}, optall), p,
@@
-342,6
+342,9
@@
jQuery.fx.prototype = {
// Start an animation from one number to another
custom: function( from, to, unit ) {
// Start an animation from one number to another
custom: function( from, to, unit ) {
+ var self = this,
+ fx = jQuery.fx;
+
this.startTime = jQuery.now();
this.start = from;
this.end = to;
this.startTime = jQuery.now();
this.start = from;
this.end = to;
@@
-349,7
+352,6
@@
jQuery.fx.prototype = {
this.now = this.start;
this.pos = this.state = 0;
this.now = this.start;
this.pos = this.state = 0;
- var self = this, fx = jQuery.fx;
function t( gotoEnd ) {
return self.step(gotoEnd);
}
function t( gotoEnd ) {
return self.step(gotoEnd);
}
@@
-406,7
+408,9
@@
jQuery.fx.prototype = {
if ( done ) {
// Reset the overflow
if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
if ( done ) {
// Reset the overflow
if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
- var elem = this.elem, options = this.options;
+ var elem = this.elem,
+ options = this.options;
+
jQuery.each( [ "", "X", "Y" ], function (index, value) {
elem.style[ "overflow" + value ] = options.overflow[index];
} );
jQuery.each( [ "", "X", "Y" ], function (index, value) {
elem.style[ "overflow" + value ] = options.overflow[index];
} );