mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Edited comments and minor adjustments. Fixes #13553. Closes gh-1195.
This commit is contained in:
parent
ae3524642c
commit
79992d7523
@ -163,3 +163,4 @@ Adam Coulombe <me@adam.co>
|
|||||||
Andrew Plummer <plummer.andrew@gmail.com>
|
Andrew Plummer <plummer.andrew@gmail.com>
|
||||||
Nguyen Phuc Lam <ruado1987@gmail.com>
|
Nguyen Phuc Lam <ruado1987@gmail.com>
|
||||||
Dmitry Gusev <dmitry.gusev@gmail.com>
|
Dmitry Gusev <dmitry.gusev@gmail.com>
|
||||||
|
Michał Z. Gołębiowski <michal.golebiowski@laboratorium.ee>
|
||||||
|
@ -140,7 +140,7 @@ jQuery.fn.load = function( url, params, callback ) {
|
|||||||
off = url.indexOf(" ");
|
off = url.indexOf(" ");
|
||||||
|
|
||||||
if ( off >= 0 ) {
|
if ( off >= 0 ) {
|
||||||
selector = url.slice( off, url.length );
|
selector = url.slice( off );
|
||||||
url = url.slice( 0, off );
|
url = url.slice( 0, off );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -427,10 +427,11 @@ jQuery.extend({
|
|||||||
jqXHR.error = jqXHR.fail;
|
jqXHR.error = jqXHR.fail;
|
||||||
|
|
||||||
// Remove hash character (#7531: and string promotion)
|
// Remove hash character (#7531: and string promotion)
|
||||||
// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
|
// Add protocol if not provided (prefilters might expect it)
|
||||||
// Handle falsy url in the settings object (#10093: consistency with old signature)
|
// Handle falsy url in the settings object (#10093: consistency with old signature)
|
||||||
// We also use the url parameter if available
|
// We also use the url parameter if available
|
||||||
s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
|
s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" )
|
||||||
|
.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
|
||||||
|
|
||||||
// Alias method option to type as per ticket #12004
|
// Alias method option to type as per ticket #12004
|
||||||
s.type = options.method || options.type || s.method || s.type;
|
s.type = options.method || options.type || s.method || s.type;
|
||||||
|
@ -20,8 +20,8 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
|
|||||||
if ( elem.nodeType === 9 ) {
|
if ( elem.nodeType === 9 ) {
|
||||||
doc = elem.documentElement;
|
doc = elem.documentElement;
|
||||||
|
|
||||||
// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
|
// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
|
||||||
// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
|
// whichever is greatest
|
||||||
return Math.max(
|
return Math.max(
|
||||||
elem.body[ "scroll" + name ], doc[ "scroll" + name ],
|
elem.body[ "scroll" + name ], doc[ "scroll" + name ],
|
||||||
elem.body[ "offset" + name ], doc[ "offset" + name ],
|
elem.body[ "offset" + name ], doc[ "offset" + name ],
|
||||||
|
4
src/effects.js
vendored
4
src/effects.js
vendored
@ -440,8 +440,8 @@ Tween.propHooks = {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Remove in 2.0 - this supports IE8's panic based approach
|
// Support: IE9
|
||||||
// to setting things on disconnected nodes
|
// Panic based approach to setting things on disconnected nodes
|
||||||
|
|
||||||
Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
|
Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
|
||||||
set: function( tween ) {
|
set: function( tween ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user