jquery data: Closes #3539. Exposed jQuery.queue. Moved all the data and queue functions to their own module. Made the dequeue function more generic(designed to be used on functions). Closes #3748. Reverted a previous modification.
This commit is contained in:
Ariel Flesler
parent
1b0276dc57
commit
4afa608351
7 changed files with 164 additions and 255 deletions
98
src/core.js
98
src/core.js
|
|
@ -483,31 +483,6 @@ jQuery.fn = jQuery.prototype = {
|
|||
return this.add( this.prevObject );
|
||||
},
|
||||
|
||||
data: function( key, value ){
|
||||
var parts = key.split(".");
|
||||
parts[1] = parts[1] ? "." + parts[1] : "";
|
||||
|
||||
if ( value === undefined ) {
|
||||
var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
|
||||
|
||||
if ( data === undefined && this.length )
|
||||
data = jQuery.data( this[0], key );
|
||||
|
||||
return data == null && parts[1] ?
|
||||
this.data( parts[0] ) :
|
||||
data;
|
||||
} else
|
||||
return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
|
||||
jQuery.data( this, key, value );
|
||||
});
|
||||
},
|
||||
|
||||
removeData: function( key ){
|
||||
return this.each(function(){
|
||||
jQuery.removeData( this, key );
|
||||
});
|
||||
},
|
||||
|
||||
domManip: function( args, table, callback ) {
|
||||
if ( this[0] ) {
|
||||
var fragment = this[0].ownerDocument.createDocumentFragment(),
|
||||
|
|
@ -606,9 +581,8 @@ jQuery.extend = jQuery.fn.extend = function() {
|
|||
return target;
|
||||
};
|
||||
|
||||
var expando = "jQuery" + now(), uuid = 0, windowData = {},
|
||||
// exclude the following css properties to add px
|
||||
exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
|
||||
// exclude the following css properties to add px
|
||||
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
|
||||
// cache defaultView
|
||||
defaultView = document.defaultView || {},
|
||||
toString = Object.prototype.toString;
|
||||
|
|
@ -667,74 +641,6 @@ jQuery.extend({
|
|||
return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
|
||||
},
|
||||
|
||||
cache: {},
|
||||
|
||||
data: function( elem, name, data ) {
|
||||
elem = elem == window ?
|
||||
windowData :
|
||||
elem;
|
||||
|
||||
var id = elem[ expando ];
|
||||
|
||||
// Compute a unique ID for the element
|
||||
if ( !id )
|
||||
id = elem[ expando ] = ++uuid;
|
||||
|
||||
// Only generate the data cache if we're
|
||||
// trying to access or manipulate it
|
||||
if ( name && !jQuery.cache[ id ] )
|
||||
jQuery.cache[ id ] = {};
|
||||
|
||||
// Prevent overriding the named cache with undefined values
|
||||
if ( data !== undefined )
|
||||
jQuery.cache[ id ][ name ] = data;
|
||||
|
||||
// Return the named cache data, or the ID for the element
|
||||
return name ?
|
||||
jQuery.cache[ id ][ name ] || null :
|
||||
id;
|
||||
},
|
||||
|
||||
removeData: function( elem, name ) {
|
||||
elem = elem == window ?
|
||||
windowData :
|
||||
elem;
|
||||
|
||||
var id = elem[ expando ];
|
||||
|
||||
// If we want to remove a specific section of the element's data
|
||||
if ( name ) {
|
||||
if ( jQuery.cache[ id ] ) {
|
||||
// Remove the section of cache data
|
||||
delete jQuery.cache[ id ][ name ];
|
||||
|
||||
// If we've removed all the data, remove the element's cache
|
||||
name = "";
|
||||
|
||||
for ( name in jQuery.cache[ id ] )
|
||||
break;
|
||||
|
||||
if ( !name )
|
||||
jQuery.removeData( elem );
|
||||
}
|
||||
|
||||
// Otherwise, we want to remove all of the element's data
|
||||
} else {
|
||||
// Clean up the element expando
|
||||
try {
|
||||
delete elem[ expando ];
|
||||
} catch(e){
|
||||
// IE has trouble directly removing the expando
|
||||
// but it's ok with using removeAttribute
|
||||
if ( elem.removeAttribute )
|
||||
elem.removeAttribute( expando );
|
||||
}
|
||||
|
||||
// Completely remove the data cache
|
||||
delete jQuery.cache[ id ];
|
||||
}
|
||||
},
|
||||
|
||||
// args is for internal usage only
|
||||
each: function( object, callback, args ) {
|
||||
var name, i = 0, length = object.length;
|
||||
|
|
|
|||
48
src/fx.js
48
src/fx.js
|
|
@ -137,27 +137,6 @@ jQuery.fn.extend({
|
|||
});
|
||||
},
|
||||
|
||||
queue: function(type, fn){
|
||||
if ( jQuery.isFunction(type) || jQuery.isArray(type) ) {
|
||||
fn = type;
|
||||
type = "fx";
|
||||
}
|
||||
|
||||
if ( !type || (typeof type === "string" && !fn) )
|
||||
return queue( this[0], type );
|
||||
|
||||
return this.each(function(){
|
||||
if ( jQuery.isArray(fn) )
|
||||
queue(this, type, fn);
|
||||
else {
|
||||
queue(this, type).push( fn );
|
||||
|
||||
if ( queue(this, type).length == 1 )
|
||||
fn.call(this);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
stop: function(clearQueue, gotoEnd){
|
||||
var timers = jQuery.timers;
|
||||
|
||||
|
|
@ -197,33 +176,6 @@ jQuery.each({
|
|||
};
|
||||
});
|
||||
|
||||
var queue = function( elem, type, array ) {
|
||||
if ( elem ){
|
||||
|
||||
type = type || "fx";
|
||||
|
||||
var q = jQuery.data( elem, type + "queue" );
|
||||
|
||||
if ( !q || array )
|
||||
q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
|
||||
|
||||
}
|
||||
return q;
|
||||
};
|
||||
|
||||
jQuery.fn.dequeue = function(type){
|
||||
type = type || "fx";
|
||||
|
||||
return this.each(function(){
|
||||
var q = queue(this, type);
|
||||
|
||||
q.shift();
|
||||
|
||||
if ( q.length )
|
||||
q[0].call( this );
|
||||
});
|
||||
};
|
||||
|
||||
jQuery.extend({
|
||||
|
||||
speed: function(speed, easing, fn) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue