Skip to content
Permalink
Browse files

Fix #12229, size/consistency improvements. Close gh-887.

  • Loading branch information...
gibson042 authored and dmethvin committed Sep 18, 2012
1 parent e8e3e90 commit 15b5dbfe2386d67b8c1df3305812b35abc04458c
Showing with 21 additions and 24 deletions.
  1. +8 −11 src/ajax.js
  2. +5 −5 src/attributes.js
  3. +3 −3 src/core.js
  4. +3 −3 src/data.js
  5. +2 −2 src/event.js
@@ -1,7 +1,7 @@
var // Document location
ajaxLocation,
// Document location segments
var
// Document location
ajaxLocParts,
ajaxLocation,

rhash = /#.*$/,
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
jqXHR.status = status;
jqXHR.statusText = "" + ( nativeStatusText || statusText );

This comment has been minimized.

Copy link
@Krinkle

Krinkle Sep 21, 2012

Member

What's this change about? a + b not the same as b + c ? That's true with type coercion, but isn't it best then to start with the string? Just trying to figure out what this is for.

jqXHR.statusText = ( nativeStatusText || statusText ) + "";

// Success/Error
if ( isSuccess ) {
@@ -578,14 +578,11 @@ jQuery.extend({
// Extract dataTypes list
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 ) {
parts = rurl.exec( s.url.toLowerCase() );
s.crossDomain = !!( parts &&
( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
);
parts = rurl.exec( s.url.toLowerCase() ) || false;
s.crossDomain = parts && ( parts.join(":") + ( parts[ 3 ] ? "" : parts[ 1 ] === "http:" ? 80 : 443 ) ) !==
( ajaxLocParts.join(":") + ( ajaxLocParts[ 3 ] ? "" : ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) );
}

// Convert data if not already a string
@@ -57,7 +57,7 @@ jQuery.fn.extend({
setClass = " " + elem.className + " ";

for ( c = 0, cl = classNames.length; c < cl; c++ ) {
if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) {
setClass += classNames[ c ] + " ";
}
}
@@ -90,7 +90,7 @@ jQuery.fn.extend({
// loop over each item in the removal list
for ( c = 0, cl = removes.length; c < cl; c++ ) {
// Remove until there is nothing to remove,
while ( className.indexOf(" " + removes[ c ] + " ") > -1 ) {
while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) {
className = className.replace( " " + removes[ c ] + " " , " " );
}
}
@@ -144,7 +144,7 @@ jQuery.fn.extend({
i = 0,
l = this.length;
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;
}
}
@@ -322,7 +322,7 @@ jQuery.extend({
return ret;

} else {
elem.setAttribute( name, "" + value );
elem.setAttribute( name, value + "" );
return value;
}

@@ -586,7 +586,7 @@ if ( !jQuery.support.style ) {
return elem.style.cssText.toLowerCase() || undefined;
},
set: function( elem, value ) {
return ( elem.style.cssText = "" + value );
return ( elem.style.cssText = value + "" );
}
};
}
@@ -559,7 +559,7 @@ jQuery.extend({
},

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
@@ -616,7 +616,7 @@ jQuery.extend({
function( text ) {
return text == null ?
"" :
text.toString().replace( rtrim, "" );
( text + "" ).replace( rtrim, "" );
},

// 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
proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
proxy.guid = fn.guid = fn.guid || jQuery.guid++;

return proxy;
},
@@ -6,7 +6,7 @@ jQuery.extend({

deletedIds: [],

// Please use with caution
// Remove at next major release (1.9/2.0)
uuid: 0,

// 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
// ends up in the global cache
if ( isNode ) {
elem[ internalKey ] = id = jQuery.deletedIds.pop() || ++jQuery.uuid;
elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++;
} else {
id = internalKey;
}
@@ -232,7 +232,7 @@ jQuery.fn.extend({
for ( l = attr.length; i < l; i++ ) {
name = attr[i].name;

if ( name.indexOf( "data-" ) === 0 ) {
if ( !name.indexOf( "data-" ) ) {
name = jQuery.camelCase( name.substring(5) );

dataAttr( elem, name, data[ name ] );
@@ -365,7 +365,7 @@ jQuery.event = {
var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
delegateCount = handlers.delegateCount,
args = [].slice.call( arguments ),
args = core_slice.call( arguments ),
run_all = !event.exclusive && !event.namespace,
special = jQuery.event.special[ event.type ] || {},
handlerQueue = [];
@@ -966,7 +966,7 @@ jQuery.fn.extend({
},
undelegate: function( 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 ) {

0 comments on commit 15b5dbf

Please sign in to comment.
You can’t perform that action at this time.