mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
No ticket: Compress core and data modules
(cherry picked from commit b31bd4c05d
)
Conflicts:
src/core.js
src/data.js
This commit is contained in:
parent
33c80f3dd4
commit
f519539d3b
84
src/core.js
84
src/core.js
@ -58,13 +58,13 @@ jQuery.fn = jQuery.prototype = {
|
|||||||
// Get the Nth element in the matched element set OR
|
// Get the Nth element in the matched element set OR
|
||||||
// Get the whole matched element set as a clean array
|
// Get the whole matched element set as a clean array
|
||||||
get: function( num ) {
|
get: function( num ) {
|
||||||
return num == null ?
|
return num != null ?
|
||||||
|
|
||||||
// Return a 'clean' array
|
// Return a 'clean' array
|
||||||
this.toArray() :
|
( num < 0 ? this[ num + this.length ] : this[ num ] ) :
|
||||||
|
|
||||||
// Return just the object
|
// Return just the object
|
||||||
( num < 0 ? this[ this.length + num ] : this[ num ] );
|
slice.call( this );
|
||||||
},
|
},
|
||||||
|
|
||||||
// Take an array of elements and push it onto the stack
|
// Take an array of elements and push it onto the stack
|
||||||
@ -89,6 +89,12 @@ jQuery.fn = jQuery.prototype = {
|
|||||||
return jQuery.each( this, callback, args );
|
return jQuery.each( this, callback, args );
|
||||||
},
|
},
|
||||||
|
|
||||||
|
map: function( callback ) {
|
||||||
|
return this.pushStack( jQuery.map(this, function( elem, i ) {
|
||||||
|
return callback.call( elem, i, elem );
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
|
||||||
slice: function() {
|
slice: function() {
|
||||||
return this.pushStack( slice.apply( this, arguments ) );
|
return this.pushStack( slice.apply( this, arguments ) );
|
||||||
},
|
},
|
||||||
@ -107,12 +113,6 @@ jQuery.fn = jQuery.prototype = {
|
|||||||
return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
|
return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
|
||||||
},
|
},
|
||||||
|
|
||||||
map: function( callback ) {
|
|
||||||
return this.pushStack( jQuery.map(this, function( elem, i ) {
|
|
||||||
return callback.call( elem, i, elem );
|
|
||||||
}));
|
|
||||||
},
|
|
||||||
|
|
||||||
end: function() {
|
end: function() {
|
||||||
return this.prevObject || this.constructor(null);
|
return this.prevObject || this.constructor(null);
|
||||||
},
|
},
|
||||||
@ -134,9 +134,10 @@ jQuery.extend = jQuery.fn.extend = function() {
|
|||||||
// Handle a deep copy situation
|
// Handle a deep copy situation
|
||||||
if ( typeof target === "boolean" ) {
|
if ( typeof target === "boolean" ) {
|
||||||
deep = target;
|
deep = target;
|
||||||
target = arguments[1] || {};
|
|
||||||
// skip the boolean and the target
|
// skip the boolean and the target
|
||||||
i = 2;
|
target = arguments[ i ] || {};
|
||||||
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle case when target is a string or something (possible in deep copy)
|
// Handle case when target is a string or something (possible in deep copy)
|
||||||
@ -145,9 +146,9 @@ jQuery.extend = jQuery.fn.extend = function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// extend jQuery itself if only one argument is passed
|
// extend jQuery itself if only one argument is passed
|
||||||
if ( length === i ) {
|
if ( i === length ) {
|
||||||
target = this;
|
target = this;
|
||||||
--i;
|
i--;
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( ; i < length; i++ ) {
|
for ( ; i < length; i++ ) {
|
||||||
@ -195,6 +196,12 @@ jQuery.extend({
|
|||||||
// Assume jQuery is ready without the ready module
|
// Assume jQuery is ready without the ready module
|
||||||
isReady: true,
|
isReady: true,
|
||||||
|
|
||||||
|
error: function( msg ) {
|
||||||
|
throw new Error( msg );
|
||||||
|
},
|
||||||
|
|
||||||
|
noop: function() {},
|
||||||
|
|
||||||
noConflict: function( deep ) {
|
noConflict: function( deep ) {
|
||||||
if ( window.$ === jQuery ) {
|
if ( window.$ === jQuery ) {
|
||||||
window.$ = _$;
|
window.$ = _$;
|
||||||
@ -227,16 +234,6 @@ jQuery.extend({
|
|||||||
return obj - parseFloat( obj ) >= 0;
|
return obj - parseFloat( obj ) >= 0;
|
||||||
},
|
},
|
||||||
|
|
||||||
type: function( obj ) {
|
|
||||||
if ( obj == null ) {
|
|
||||||
return String( obj );
|
|
||||||
}
|
|
||||||
// Support: Android < 4.0, iOS < 6 (functionish RegExp)
|
|
||||||
return typeof obj === "object" || typeof obj === "function" ?
|
|
||||||
class2type[ toString.call(obj) ] || "object" :
|
|
||||||
typeof obj;
|
|
||||||
},
|
|
||||||
|
|
||||||
isPlainObject: function( obj ) {
|
isPlainObject: function( obj ) {
|
||||||
// Not plain objects:
|
// Not plain objects:
|
||||||
// - Any object or value whose internal [[Class]] property is not "[object Object]"
|
// - Any object or value whose internal [[Class]] property is not "[object Object]"
|
||||||
@ -272,12 +269,16 @@ jQuery.extend({
|
|||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
|
|
||||||
error: function( msg ) {
|
type: function( obj ) {
|
||||||
throw new Error( msg );
|
if ( obj == null ) {
|
||||||
|
return obj + "";
|
||||||
|
}
|
||||||
|
// Support: Android < 4.0, iOS < 6 (functionish RegExp)
|
||||||
|
return typeof obj === "object" || typeof obj === "function" ?
|
||||||
|
class2type[ toString.call(obj) ] || "object" :
|
||||||
|
typeof obj;
|
||||||
},
|
},
|
||||||
|
|
||||||
noop: function() {},
|
|
||||||
|
|
||||||
// Evaluates a script in a global context
|
// Evaluates a script in a global context
|
||||||
globalEval: function( code ) {
|
globalEval: function( code ) {
|
||||||
var script,
|
var script,
|
||||||
@ -401,23 +402,23 @@ jQuery.extend({
|
|||||||
return first;
|
return first;
|
||||||
},
|
},
|
||||||
|
|
||||||
grep: function( elems, callback, inv ) {
|
grep: function( elems, callback, invert ) {
|
||||||
var retVal,
|
var callbackInverse,
|
||||||
ret = [],
|
matches = [],
|
||||||
i = 0,
|
i = 0,
|
||||||
length = elems.length;
|
length = elems.length,
|
||||||
inv = !!inv;
|
callbackExpect = !invert;
|
||||||
|
|
||||||
// Go through the array, only saving the items
|
// Go through the array, only saving the items
|
||||||
// that pass the validator function
|
// that pass the validator function
|
||||||
for ( ; i < length; i++ ) {
|
for ( ; i < length; i++ ) {
|
||||||
retVal = !!callback( elems[ i ], i );
|
callbackInverse = !callback( elems[ i ], i );
|
||||||
if ( inv !== retVal ) {
|
if ( callbackInverse !== callbackExpect ) {
|
||||||
ret.push( elems[ i ] );
|
matches.push( elems[ i ] );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return matches;
|
||||||
},
|
},
|
||||||
|
|
||||||
// arg is for internal usage only
|
// arg is for internal usage only
|
||||||
@ -434,7 +435,7 @@ jQuery.extend({
|
|||||||
value = callback( elems[ i ], i, arg );
|
value = callback( elems[ i ], i, arg );
|
||||||
|
|
||||||
if ( value != null ) {
|
if ( value != null ) {
|
||||||
ret[ ret.length ] = value;
|
ret.push( value );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -444,7 +445,7 @@ jQuery.extend({
|
|||||||
value = callback( elems[ i ], i, arg );
|
value = callback( elems[ i ], i, arg );
|
||||||
|
|
||||||
if ( value != null ) {
|
if ( value != null ) {
|
||||||
ret[ ret.length ] = value;
|
ret.push( value );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -501,7 +502,7 @@ function isArraylike( obj ) {
|
|||||||
var length = obj.length,
|
var length = obj.length,
|
||||||
type = jQuery.type( obj );
|
type = jQuery.type( obj );
|
||||||
|
|
||||||
if ( jQuery.isWindow( obj ) ) {
|
if ( type === "function" || jQuery.isWindow( obj ) ) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -509,9 +510,8 @@ function isArraylike( obj ) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return type === "array" || type !== "function" &&
|
return type === "array" || length === 0 ||
|
||||||
( length === 0 ||
|
typeof length === "number" && length > 0 && ( length - 1 ) in obj;
|
||||||
typeof length === "number" && length > 0 && ( length - 1 ) in obj );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return jQuery;
|
return jQuery;
|
||||||
|
12
src/data.js
12
src/data.js
@ -17,7 +17,7 @@ define([
|
|||||||
5. Avoid exposing implementation details on user objects (eg. expando properties)
|
5. Avoid exposing implementation details on user objects (eg. expando properties)
|
||||||
6. Provide a clear path for implementation upgrade to WeakMap in 2014
|
6. Provide a clear path for implementation upgrade to WeakMap in 2014
|
||||||
*/
|
*/
|
||||||
var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
|
var rbrace = /(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
|
||||||
rmultiDash = /([A-Z])/g;
|
rmultiDash = /([A-Z])/g;
|
||||||
|
|
||||||
function dataAttr( elem, key, data ) {
|
function dataAttr( elem, key, data ) {
|
||||||
@ -75,10 +75,10 @@ jQuery.extend({
|
|||||||
|
|
||||||
jQuery.fn.extend({
|
jQuery.fn.extend({
|
||||||
data: function( key, value ) {
|
data: function( key, value ) {
|
||||||
var attrs, name,
|
var i, name,
|
||||||
|
data = null,
|
||||||
elem = this[ 0 ],
|
elem = this[ 0 ],
|
||||||
i = 0,
|
attrs = elem && elem.attributes;
|
||||||
data = null;
|
|
||||||
|
|
||||||
// Gets all values
|
// Gets all values
|
||||||
if ( key === undefined ) {
|
if ( key === undefined ) {
|
||||||
@ -86,8 +86,8 @@ jQuery.fn.extend({
|
|||||||
data = data_user.get( elem );
|
data = data_user.get( elem );
|
||||||
|
|
||||||
if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
|
if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
|
||||||
attrs = elem.attributes;
|
i = attrs.length;
|
||||||
for ( ; i < attrs.length; i++ ) {
|
while ( i-- ) {
|
||||||
name = attrs[ i ].name;
|
name = attrs[ i ].name;
|
||||||
|
|
||||||
if ( name.indexOf( "data-" ) === 0 ) {
|
if ( name.indexOf( "data-" ) === 0 ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user