mirror of
https://github.com/jquery/jquery.git
synced 2024-10-05 11:34:18 +00:00
Fix #12229, size/consistency improvements. Close gh-887.
This commit is contained in:
parent
e8e3e90a86
commit
15b5dbfe23
19
src/ajax.js
19
src/ajax.js
@ -1,7 +1,7 @@
|
|||||||
var // Document location
|
var
|
||||||
ajaxLocation,
|
// Document location
|
||||||
// Document location segments
|
|
||||||
ajaxLocParts,
|
ajaxLocParts,
|
||||||
|
ajaxLocation,
|
||||||
|
|
||||||
rhash = /#.*$/,
|
rhash = /#.*$/,
|
||||||
rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
|
rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
|
||||||
@ -518,7 +518,7 @@ jQuery.extend({
|
|||||||
|
|
||||||
// Set data for the fake xhr object
|
// Set data for the fake xhr object
|
||||||
jqXHR.status = status;
|
jqXHR.status = status;
|
||||||
jqXHR.statusText = "" + ( nativeStatusText || statusText );
|
jqXHR.statusText = ( nativeStatusText || statusText ) + "";
|
||||||
|
|
||||||
// Success/Error
|
// Success/Error
|
||||||
if ( isSuccess ) {
|
if ( isSuccess ) {
|
||||||
@ -578,14 +578,11 @@ jQuery.extend({
|
|||||||
// Extract dataTypes list
|
// Extract dataTypes list
|
||||||
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
|
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
|
||||||
|
|
||||||
// Determine if a cross-domain request is in order
|
// A cross-domain request is in order when we have a protocol:host:port mismatch
|
||||||
if ( s.crossDomain == null ) {
|
if ( s.crossDomain == null ) {
|
||||||
parts = rurl.exec( s.url.toLowerCase() );
|
parts = rurl.exec( s.url.toLowerCase() ) || false;
|
||||||
s.crossDomain = !!( parts &&
|
s.crossDomain = parts && ( parts.join(":") + ( parts[ 3 ] ? "" : parts[ 1 ] === "http:" ? 80 : 443 ) ) !==
|
||||||
( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
|
( ajaxLocParts.join(":") + ( ajaxLocParts[ 3 ] ? "" : ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) );
|
||||||
( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
|
|
||||||
( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert data if not already a string
|
// Convert data if not already a string
|
||||||
|
@ -57,7 +57,7 @@ jQuery.fn.extend({
|
|||||||
setClass = " " + elem.className + " ";
|
setClass = " " + elem.className + " ";
|
||||||
|
|
||||||
for ( c = 0, cl = classNames.length; c < cl; c++ ) {
|
for ( c = 0, cl = classNames.length; c < cl; c++ ) {
|
||||||
if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
|
if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) {
|
||||||
setClass += classNames[ c ] + " ";
|
setClass += classNames[ c ] + " ";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -90,7 +90,7 @@ jQuery.fn.extend({
|
|||||||
// loop over each item in the removal list
|
// loop over each item in the removal list
|
||||||
for ( c = 0, cl = removes.length; c < cl; c++ ) {
|
for ( c = 0, cl = removes.length; c < cl; c++ ) {
|
||||||
// Remove until there is nothing to remove,
|
// Remove until there is nothing to remove,
|
||||||
while ( className.indexOf(" " + removes[ c ] + " ") > -1 ) {
|
while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) {
|
||||||
className = className.replace( " " + removes[ c ] + " " , " " );
|
className = className.replace( " " + removes[ c ] + " " , " " );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -144,7 +144,7 @@ jQuery.fn.extend({
|
|||||||
i = 0,
|
i = 0,
|
||||||
l = this.length;
|
l = this.length;
|
||||||
for ( ; i < l; i++ ) {
|
for ( ; i < l; i++ ) {
|
||||||
if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
|
if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -322,7 +322,7 @@ jQuery.extend({
|
|||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
elem.setAttribute( name, "" + value );
|
elem.setAttribute( name, value + "" );
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -586,7 +586,7 @@ if ( !jQuery.support.style ) {
|
|||||||
return elem.style.cssText.toLowerCase() || undefined;
|
return elem.style.cssText.toLowerCase() || undefined;
|
||||||
},
|
},
|
||||||
set: function( elem, value ) {
|
set: function( elem, value ) {
|
||||||
return ( elem.style.cssText = "" + value );
|
return ( elem.style.cssText = value + "" );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -559,7 +559,7 @@ jQuery.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
nodeName: function( elem, name ) {
|
nodeName: function( elem, name ) {
|
||||||
return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
|
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
|
||||||
},
|
},
|
||||||
|
|
||||||
// args is for internal usage only
|
// args is for internal usage only
|
||||||
@ -616,7 +616,7 @@ jQuery.extend({
|
|||||||
function( text ) {
|
function( text ) {
|
||||||
return text == null ?
|
return text == null ?
|
||||||
"" :
|
"" :
|
||||||
text.toString().replace( rtrim, "" );
|
( text + "" ).replace( rtrim, "" );
|
||||||
},
|
},
|
||||||
|
|
||||||
// results is for internal usage only
|
// results is for internal usage only
|
||||||
@ -762,7 +762,7 @@ jQuery.extend({
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Set the guid of unique handler to the same of original handler, so it can be removed
|
// Set the guid of unique handler to the same of original handler, so it can be removed
|
||||||
proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
|
proxy.guid = fn.guid = fn.guid || jQuery.guid++;
|
||||||
|
|
||||||
return proxy;
|
return proxy;
|
||||||
},
|
},
|
||||||
|
@ -6,7 +6,7 @@ jQuery.extend({
|
|||||||
|
|
||||||
deletedIds: [],
|
deletedIds: [],
|
||||||
|
|
||||||
// Please use with caution
|
// Remove at next major release (1.9/2.0)
|
||||||
uuid: 0,
|
uuid: 0,
|
||||||
|
|
||||||
// Unique for each copy of jQuery on the page
|
// Unique for each copy of jQuery on the page
|
||||||
@ -58,7 +58,7 @@ jQuery.extend({
|
|||||||
// Only DOM nodes need a new unique ID for each element since their data
|
// Only DOM nodes need a new unique ID for each element since their data
|
||||||
// ends up in the global cache
|
// ends up in the global cache
|
||||||
if ( isNode ) {
|
if ( isNode ) {
|
||||||
elem[ internalKey ] = id = jQuery.deletedIds.pop() || ++jQuery.uuid;
|
elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++;
|
||||||
} else {
|
} else {
|
||||||
id = internalKey;
|
id = internalKey;
|
||||||
}
|
}
|
||||||
@ -232,7 +232,7 @@ jQuery.fn.extend({
|
|||||||
for ( l = attr.length; i < l; i++ ) {
|
for ( l = attr.length; i < l; i++ ) {
|
||||||
name = attr[i].name;
|
name = attr[i].name;
|
||||||
|
|
||||||
if ( name.indexOf( "data-" ) === 0 ) {
|
if ( !name.indexOf( "data-" ) ) {
|
||||||
name = jQuery.camelCase( name.substring(5) );
|
name = jQuery.camelCase( name.substring(5) );
|
||||||
|
|
||||||
dataAttr( elem, name, data[ name ] );
|
dataAttr( elem, name, data[ name ] );
|
||||||
|
@ -365,7 +365,7 @@ jQuery.event = {
|
|||||||
var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
|
var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
|
||||||
handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
|
handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
|
||||||
delegateCount = handlers.delegateCount,
|
delegateCount = handlers.delegateCount,
|
||||||
args = [].slice.call( arguments ),
|
args = core_slice.call( arguments ),
|
||||||
run_all = !event.exclusive && !event.namespace,
|
run_all = !event.exclusive && !event.namespace,
|
||||||
special = jQuery.event.special[ event.type ] || {},
|
special = jQuery.event.special[ event.type ] || {},
|
||||||
handlerQueue = [];
|
handlerQueue = [];
|
||||||
@ -966,7 +966,7 @@ jQuery.fn.extend({
|
|||||||
},
|
},
|
||||||
undelegate: function( selector, types, fn ) {
|
undelegate: function( selector, types, fn ) {
|
||||||
// ( namespace ) or ( selector, types [, fn] )
|
// ( namespace ) or ( selector, types [, fn] )
|
||||||
return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
|
return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
|
||||||
},
|
},
|
||||||
|
|
||||||
trigger: function( type, data ) {
|
trigger: function( type, data ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user