Merge branch 'master' of github.com:jquery/jquery
This commit is contained in:
Dave Methvin
commit
c470db6950
8 changed files with 550 additions and 334 deletions
27
src/core.js
27
src/core.js
|
|
@ -565,24 +565,17 @@ jQuery.extend({
|
|||
|
||||
noop: function() {},
|
||||
|
||||
// Evalulates a script in a global context
|
||||
// Evaluates a script in a global context
|
||||
// Workarounds based on findings by Jim Driscoll
|
||||
// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
|
||||
globalEval: function( data ) {
|
||||
if ( data && rnotwhite.test(data) ) {
|
||||
// Inspired by code by Andrea Giammarchi
|
||||
// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
|
||||
var head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement,
|
||||
script = document.createElement( "script" );
|
||||
|
||||
if ( jQuery.support.scriptEval() ) {
|
||||
script.appendChild( document.createTextNode( data ) );
|
||||
} else {
|
||||
script.text = data;
|
||||
}
|
||||
|
||||
// Use insertBefore instead of appendChild to circumvent an IE6 bug.
|
||||
// This arises when a base node is used (#2709).
|
||||
head.insertBefore( script, head.firstChild );
|
||||
head.removeChild( script );
|
||||
if ( data && rnotwhite.test( data ) ) {
|
||||
// We use execScript on Internet Explorer
|
||||
// We use an anonymous function so that context is window
|
||||
// rather than jQuery in Firefox
|
||||
( window.execScript || function( data ) {
|
||||
window[ "eval" ].call( window, data );
|
||||
} )( data );
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
(function( jQuery ) {
|
||||
|
||||
var // Promise methods
|
||||
promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
|
||||
promiseMethods = "done fail isResolved isRejected promise then always chain".split( " " ),
|
||||
// Static reference to slice
|
||||
sliceDeferred = [].slice;
|
||||
|
||||
|
|
@ -100,10 +100,38 @@ jQuery.extend({
|
|||
deferred.done( doneCallbacks ).fail( failCallbacks );
|
||||
return this;
|
||||
},
|
||||
always: function() {
|
||||
return deferred.done.apply( deferred, arguments ).fail.apply( this, arguments );
|
||||
},
|
||||
fail: failDeferred.done,
|
||||
rejectWith: failDeferred.resolveWith,
|
||||
reject: failDeferred.resolve,
|
||||
isRejected: failDeferred.isResolved,
|
||||
// Chain
|
||||
chain: function( fnDone, fnFail ) {
|
||||
return jQuery.Deferred(function( newDefer ) {
|
||||
jQuery.each( {
|
||||
done: [ fnDone, "resolve" ],
|
||||
fail: [ fnFail, "reject" ]
|
||||
}, function( handler, data ) {
|
||||
var fn = data[ 0 ],
|
||||
action = data[ 1 ],
|
||||
returned;
|
||||
if ( jQuery.isFunction( fn ) ) {
|
||||
deferred[ handler ](function() {
|
||||
returned = fn.apply( this, arguments );
|
||||
if ( jQuery.isFunction( returned.promise ) ) {
|
||||
returned.promise().then( newDefer.resolve, newDefer.reject );
|
||||
} else {
|
||||
newDefer[ action ]( returned );
|
||||
}
|
||||
});
|
||||
} else {
|
||||
deferred[ handler ]( newDefer[ action ] );
|
||||
}
|
||||
} );
|
||||
}).promise();
|
||||
},
|
||||
// Get a promise for this deferred
|
||||
// If obj is provided, the promise aspect is added to the object
|
||||
promise: function( obj ) {
|
||||
|
|
@ -169,4 +197,4 @@ jQuery.extend({
|
|||
}
|
||||
});
|
||||
|
||||
})( jQuery );
|
||||
})( jQuery );
|
||||
17
src/effects.js
vendored
17
src/effects.js
vendored
|
|
@ -11,7 +11,17 @@ var elemdisplay = {},
|
|||
[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
|
||||
// opacity animations
|
||||
[ "opacity" ]
|
||||
];
|
||||
],
|
||||
fxNow;
|
||||
|
||||
function clearFxNow() {
|
||||
fxNow = undefined;
|
||||
}
|
||||
|
||||
function createFxNow() {
|
||||
setTimeout( clearFxNow, 0 );
|
||||
return ( fxNow = jQuery.now() );
|
||||
}
|
||||
|
||||
jQuery.fn.extend({
|
||||
show: function( speed, easing, callback ) {
|
||||
|
|
@ -349,7 +359,7 @@ jQuery.fx.prototype = {
|
|||
var self = this,
|
||||
fx = jQuery.fx;
|
||||
|
||||
this.startTime = jQuery.now();
|
||||
this.startTime = fxNow || createFxNow();
|
||||
this.start = from;
|
||||
this.end = to;
|
||||
this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
|
||||
|
|
@ -394,7 +404,8 @@ jQuery.fx.prototype = {
|
|||
|
||||
// Each step of an animation
|
||||
step: function( gotoEnd ) {
|
||||
var t = jQuery.now(), done = true;
|
||||
var t = fxNow || createFxNow(),
|
||||
done = true;
|
||||
|
||||
if ( gotoEnd || t >= this.options.duration + this.startTime ) {
|
||||
this.now = this.end;
|
||||
|
|
|
|||
45
src/queue.js
45
src/queue.js
|
|
@ -28,7 +28,8 @@ jQuery.extend({
|
|||
type = type || "fx";
|
||||
|
||||
var queue = jQuery.queue( elem, type ),
|
||||
fn = queue.shift();
|
||||
fn = queue.shift(),
|
||||
defer;
|
||||
|
||||
// If the fx queue is dequeued, always remove the progress sentinel
|
||||
if ( fn === "inprogress" ) {
|
||||
|
|
@ -49,6 +50,17 @@ jQuery.extend({
|
|||
|
||||
if ( !queue.length ) {
|
||||
jQuery.removeData( elem, type + "queue", true );
|
||||
// Look if we have observers and resolve if needed
|
||||
if (( defer = jQuery.data( elem, type + "defer", undefined, true ) )) {
|
||||
// Give room for hard-coded callbacks to fire first
|
||||
// and eventually add another animation on the element
|
||||
setTimeout( function() {
|
||||
if ( !jQuery.data( elem, type + "queue", undefined, true ) ) {
|
||||
jQuery.removeData( elem, type + "defer", true );
|
||||
defer.resolve();
|
||||
}
|
||||
}, 0 );
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -93,6 +105,37 @@ jQuery.fn.extend({
|
|||
|
||||
clearQueue: function( type ) {
|
||||
return this.queue( type || "fx", [] );
|
||||
},
|
||||
|
||||
// Get a promise resolved when queues of a certain type
|
||||
// are emptied (fx is the type by default)
|
||||
promise: function( type, object ) {
|
||||
if ( typeof type !== "string" ) {
|
||||
object = type;
|
||||
type = undefined;
|
||||
}
|
||||
type = type || "fx";
|
||||
var defer = jQuery.Deferred(),
|
||||
elements = this,
|
||||
i = elements.length,
|
||||
count = 1,
|
||||
deferDataKey = type + "defer",
|
||||
queueDataKey = type + "queue";
|
||||
function resolve() {
|
||||
if ( !( --count ) ) {
|
||||
defer.resolveWith( elements, [ elements ] );
|
||||
}
|
||||
}
|
||||
while( i-- ) {
|
||||
if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
|
||||
jQuery.data( elements[ i ], queueDataKey, undefined, true ) &&
|
||||
jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) {
|
||||
count++;
|
||||
tmp.done( resolve );
|
||||
}
|
||||
}
|
||||
resolve();
|
||||
return defer.promise();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
274
src/support.js
274
src/support.js
|
|
@ -1,44 +1,58 @@
|
|||
(function( jQuery ) {
|
||||
|
||||
(function() {
|
||||
jQuery.support = (function() {
|
||||
|
||||
jQuery.support = {};
|
||||
var div = document.createElement( "div" ),
|
||||
all,
|
||||
a,
|
||||
select,
|
||||
opt,
|
||||
input,
|
||||
support,
|
||||
fragment,
|
||||
body,
|
||||
bodyStyle,
|
||||
tds,
|
||||
events,
|
||||
eventName,
|
||||
i,
|
||||
isSupported;
|
||||
|
||||
var div = document.createElement("div");
|
||||
|
||||
div.style.display = "none";
|
||||
// Preliminary tests
|
||||
div.innerHTML = " <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
|
||||
|
||||
var all = div.getElementsByTagName("*"),
|
||||
a = div.getElementsByTagName("a")[0],
|
||||
select = document.createElement("select"),
|
||||
opt = select.appendChild( document.createElement("option") ),
|
||||
input = div.getElementsByTagName("input")[0];
|
||||
all = div.getElementsByTagName( "*" );
|
||||
a = div.getElementsByTagName( "a" )[ 0 ];
|
||||
|
||||
// Can't get basic test support
|
||||
if ( !all || !all.length || !a ) {
|
||||
return;
|
||||
return {};
|
||||
}
|
||||
|
||||
jQuery.support = {
|
||||
// First batch of supports tests
|
||||
select = document.createElement( "select" );
|
||||
opt = select.appendChild( document.createElement("option") );
|
||||
input = div.getElementsByTagName( "input" )[ 0 ];
|
||||
|
||||
support = {
|
||||
// IE strips leading whitespace when .innerHTML is used
|
||||
leadingWhitespace: div.firstChild.nodeType === 3,
|
||||
leadingWhitespace: ( div.firstChild.nodeType === 3 ),
|
||||
|
||||
// Make sure that tbody elements aren't automatically inserted
|
||||
// IE will insert them into empty tables
|
||||
tbody: !div.getElementsByTagName("tbody").length,
|
||||
tbody: !div.getElementsByTagName( "tbody" ).length,
|
||||
|
||||
// Make sure that link elements get serialized correctly by innerHTML
|
||||
// This requires a wrapper element in IE
|
||||
htmlSerialize: !!div.getElementsByTagName("link").length,
|
||||
htmlSerialize: !!div.getElementsByTagName( "link" ).length,
|
||||
|
||||
// Get the style information from getAttribute
|
||||
// (IE uses .cssText insted)
|
||||
// (IE uses .cssText instead)
|
||||
style: /red/.test( a.getAttribute("style") ),
|
||||
|
||||
// Make sure that URLs aren't manipulated
|
||||
// (IE normalizes it by default)
|
||||
hrefNormalized: a.getAttribute("href") === "/a",
|
||||
hrefNormalized: ( a.getAttribute( "href" ) === "/a" ),
|
||||
|
||||
// Make sure that element opacity exists
|
||||
// (IE uses filter instead)
|
||||
|
|
@ -59,176 +73,152 @@
|
|||
optSelected: opt.selected,
|
||||
|
||||
// Will be defined later
|
||||
submitBubbles: true,
|
||||
changeBubbles: true,
|
||||
deleteExpando: true,
|
||||
optDisabled: false,
|
||||
checkClone: false,
|
||||
noCloneEvent: true,
|
||||
noCloneChecked: true,
|
||||
boxModel: null,
|
||||
inlineBlockNeedsLayout: false,
|
||||
shrinkWrapBlocks: false,
|
||||
reliableHiddenOffsets: true,
|
||||
reliableMarginRight: true
|
||||
};
|
||||
|
||||
// Make sure checked status is properly cloned
|
||||
input.checked = true;
|
||||
jQuery.support.noCloneChecked = input.cloneNode( true ).checked;
|
||||
support.noCloneChecked = input.cloneNode( true ).checked;
|
||||
|
||||
// Make sure that the options inside disabled selects aren't marked as disabled
|
||||
// (WebKit marks them as diabled)
|
||||
// (WebKit marks them as disabled)
|
||||
select.disabled = true;
|
||||
jQuery.support.optDisabled = !opt.disabled;
|
||||
|
||||
var _scriptEval = null;
|
||||
jQuery.support.scriptEval = function() {
|
||||
if ( _scriptEval === null ) {
|
||||
var root = document.documentElement,
|
||||
script = document.createElement("script"),
|
||||
id = "script" + jQuery.now();
|
||||
|
||||
// Make sure that the execution of code works by injecting a script
|
||||
// tag with appendChild/createTextNode
|
||||
// (IE doesn't support this, fails, and uses .text instead)
|
||||
try {
|
||||
script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
|
||||
} catch(e) {}
|
||||
|
||||
root.insertBefore( script, root.firstChild );
|
||||
|
||||
if ( window[ id ] ) {
|
||||
_scriptEval = true;
|
||||
delete window[ id ];
|
||||
} else {
|
||||
_scriptEval = false;
|
||||
}
|
||||
|
||||
root.removeChild( script );
|
||||
}
|
||||
|
||||
return _scriptEval;
|
||||
};
|
||||
support.optDisabled = !opt.disabled;
|
||||
|
||||
// Test to see if it's possible to delete an expando from an element
|
||||
// Fails in Internet Explorer
|
||||
try {
|
||||
delete div.test;
|
||||
|
||||
} catch(e) {
|
||||
jQuery.support.deleteExpando = false;
|
||||
} catch( e ) {
|
||||
support.deleteExpando = false;
|
||||
}
|
||||
|
||||
if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
|
||||
div.attachEvent("onclick", function click() {
|
||||
div.attachEvent( "onclick", function click() {
|
||||
// Cloning a node shouldn't copy over any
|
||||
// bound event handlers (IE does this)
|
||||
jQuery.support.noCloneEvent = false;
|
||||
div.detachEvent("onclick", click);
|
||||
});
|
||||
div.cloneNode(true).fireEvent("onclick");
|
||||
support.noCloneEvent = false;
|
||||
div.detachEvent( "onclick", click );
|
||||
} );
|
||||
div.cloneNode( true ).fireEvent( "onclick" );
|
||||
}
|
||||
|
||||
div = document.createElement("div");
|
||||
div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
|
||||
|
||||
var fragment = document.createDocumentFragment();
|
||||
fragment = document.createDocumentFragment();
|
||||
fragment.appendChild( div.firstChild );
|
||||
|
||||
// WebKit doesn't clone checked state correctly in fragments
|
||||
jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
|
||||
support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
|
||||
|
||||
div.innerHTML = "";
|
||||
|
||||
// Figure out if the W3C box model works as expected
|
||||
// document.body must exist before we can do this
|
||||
jQuery(function() {
|
||||
var div = document.createElement("div"),
|
||||
body = document.getElementsByTagName("body")[0];
|
||||
div.style.width = div.style.paddingLeft = "1px";
|
||||
|
||||
// Frameset documents with no body should not run this code
|
||||
if ( !body ) {
|
||||
return;
|
||||
}
|
||||
// We use our own, invisible, body
|
||||
body = document.createElement( "body" );
|
||||
bodyStyle = {
|
||||
visibility: "hidden",
|
||||
width: 0,
|
||||
height: 0,
|
||||
border: 0,
|
||||
margin: 0
|
||||
};
|
||||
for ( i in bodyStyle ) {
|
||||
body.style[ i ] = bodyStyle[ i ];
|
||||
}
|
||||
body.appendChild( div );
|
||||
document.documentElement.appendChild( body );
|
||||
|
||||
div.style.width = div.style.paddingLeft = "1px";
|
||||
body.appendChild( div );
|
||||
jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
|
||||
support.boxModel = div.offsetWidth === 2;
|
||||
|
||||
if ( "zoom" in div.style ) {
|
||||
// Check if natively block-level elements act like inline-block
|
||||
// elements when setting their display to 'inline' and giving
|
||||
// them layout
|
||||
// (IE < 8 does this)
|
||||
div.style.display = "inline";
|
||||
div.style.zoom = 1;
|
||||
jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
|
||||
if ( "zoom" in div.style ) {
|
||||
// Check if natively block-level elements act like inline-block
|
||||
// elements when setting their display to 'inline' and giving
|
||||
// them layout
|
||||
// (IE < 8 does this)
|
||||
div.style.display = "inline";
|
||||
div.style.zoom = 1;
|
||||
support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
|
||||
|
||||
// Check if elements with layout shrink-wrap their children
|
||||
// (IE 6 does this)
|
||||
div.style.display = "";
|
||||
div.innerHTML = "<div style='width:4px;'></div>";
|
||||
jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
|
||||
}
|
||||
// Check if elements with layout shrink-wrap their children
|
||||
// (IE 6 does this)
|
||||
div.style.display = "";
|
||||
div.innerHTML = "<div style='width:4px;'></div>";
|
||||
support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
|
||||
}
|
||||
|
||||
div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
|
||||
var tds = div.getElementsByTagName("td");
|
||||
div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
|
||||
tds = div.getElementsByTagName( "td" );
|
||||
|
||||
// Check if table cells still have offsetWidth/Height when they are set
|
||||
// to display:none and there are still other visible table cells in a
|
||||
// table row; if so, offsetWidth/Height are not reliable for use when
|
||||
// determining if an element has been hidden directly using
|
||||
// display:none (it is still safe to use offsets if a parent element is
|
||||
// hidden; don safety goggles and see bug #4512 for more information).
|
||||
// (only IE 8 fails this test)
|
||||
jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
|
||||
// Check if table cells still have offsetWidth/Height when they are set
|
||||
// to display:none and there are still other visible table cells in a
|
||||
// table row; if so, offsetWidth/Height are not reliable for use when
|
||||
// determining if an element has been hidden directly using
|
||||
// display:none (it is still safe to use offsets if a parent element is
|
||||
// hidden; don safety goggles and see bug #4512 for more information).
|
||||
// (only IE 8 fails this test)
|
||||
isSupported = ( tds[ 0 ].offsetHeight === 0 );
|
||||
|
||||
tds[0].style.display = "";
|
||||
tds[1].style.display = "none";
|
||||
tds[ 0 ].style.display = "";
|
||||
tds[ 1 ].style.display = "none";
|
||||
|
||||
// Check if empty table cells still have offsetWidth/Height
|
||||
// (IE < 8 fail this test)
|
||||
jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
|
||||
div.innerHTML = "";
|
||||
// Check if empty table cells still have offsetWidth/Height
|
||||
// (IE < 8 fail this test)
|
||||
support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
|
||||
div.innerHTML = "";
|
||||
|
||||
// Check if div with explicit width and no margin-right incorrectly
|
||||
// gets computed margin-right based on width of container. For more
|
||||
// info see bug #3333
|
||||
// Fails in WebKit before Feb 2011 nightlies
|
||||
// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
|
||||
if ( document.defaultView && document.defaultView.getComputedStyle ) {
|
||||
div.style.width = "1px";
|
||||
div.style.marginRight = "0";
|
||||
jQuery.support.reliableMarginRight = ( parseInt(document.defaultView.getComputedStyle(div, null).marginRight, 10) || 0 ) === 0;
|
||||
}
|
||||
// Check if div with explicit width and no margin-right incorrectly
|
||||
// gets computed margin-right based on width of container. For more
|
||||
// info see bug #3333
|
||||
// Fails in WebKit before Feb 2011 nightlies
|
||||
// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
|
||||
if ( document.defaultView && document.defaultView.getComputedStyle ) {
|
||||
div.style.width = "1px";
|
||||
div.style.marginRight = "0";
|
||||
support.reliableMarginRight =
|
||||
( parseInt( document.defaultView.getComputedStyle(div).marginRight, 10 ) || 0 ) === 0;
|
||||
}
|
||||
|
||||
body.removeChild( div ).style.display = "none";
|
||||
div = tds = null;
|
||||
});
|
||||
// Remove the body element we added
|
||||
document.documentElement.removeChild( body );
|
||||
|
||||
// Technique from Juriy Zaytsev
|
||||
// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
|
||||
var eventSupported = function( eventName ) {
|
||||
var el = document.createElement("div");
|
||||
eventName = "on" + eventName;
|
||||
|
||||
// We only care about the case where non-standard event systems
|
||||
// are used, namely in IE. Short-circuiting here helps us to
|
||||
// avoid an eval call (in setAttribute) which can cause CSP
|
||||
// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
|
||||
if ( !el.attachEvent ) {
|
||||
return true;
|
||||
// We only care about the case where non-standard event systems
|
||||
// are used, namely in IE. Short-circuiting here helps us to
|
||||
// avoid an eval call (in setAttribute) which can cause CSP
|
||||
// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
|
||||
if ( div.attachEvent ) {
|
||||
for( i in {
|
||||
submit: 1,
|
||||
change: 1,
|
||||
focusin: 1
|
||||
} ) {
|
||||
eventName = "on" + i;
|
||||
isSupported = ( eventName in div );
|
||||
if ( !isSupported ) {
|
||||
div.setAttribute( eventName, "return;" );
|
||||
isSupported = ( typeof div[ eventName ] === "function" );
|
||||
}
|
||||
support[ i + "Bubbles" ] = isSupported;
|
||||
}
|
||||
|
||||
var isSupported = (eventName in el);
|
||||
if ( !isSupported ) {
|
||||
el.setAttribute(eventName, "return;");
|
||||
isSupported = typeof el[eventName] === "function";
|
||||
}
|
||||
return isSupported;
|
||||
};
|
||||
|
||||
jQuery.support.submitBubbles = eventSupported("submit");
|
||||
jQuery.support.changeBubbles = eventSupported("change");
|
||||
jQuery.support.focusinBubbles = document.attachEvent && eventSupported("focusin");
|
||||
}
|
||||
|
||||
// release memory in IE
|
||||
div = all = a = null;
|
||||
body = div = all = a = tds = undefined;
|
||||
|
||||
return support;
|
||||
})();
|
||||
|
||||
// Keep track of boxModel
|
||||
jQuery.boxModel = jQuery.support.boxModel;
|
||||
|
||||
})( jQuery );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue