scratch – Diff between revs 58 and 125

Subversion Repositories:
Rev:
Show entire file – Regard whitespace
Rev 58 Rev 125
Line 1... Line 1...
1 define( [ 1 define([
2 "./core", 2 "./core",
3 "./data/var/dataPriv", 3 "./data/var/data_priv",
4 "./deferred", 4 "./deferred",
5 "./callbacks" 5 "./callbacks"
6 ], function( jQuery, dataPriv ) { 6 ], function( jQuery, data_priv ) {
7   -  
8 "use strict"; -  
Line 9... Line 7...
9   7  
10 jQuery.extend( { 8 jQuery.extend({
11 queue: function( elem, type, data ) { 9 queue: function( elem, type, data ) {
Line 12... Line 10...
12 var queue; 10 var queue;
13   11  
14 if ( elem ) { 12 if ( elem ) {
Line 15... Line 13...
15 type = ( type || "fx" ) + "queue"; 13 type = ( type || "fx" ) + "queue";
16 queue = dataPriv.get( elem, type ); 14 queue = data_priv.get( elem, type );
17   15  
18 // Speed up dequeue by getting out quickly if this is just a lookup 16 // Speed up dequeue by getting out quickly if this is just a lookup
19 if ( data ) { 17 if ( data ) {
20 if ( !queue || jQuery.isArray( data ) ) { 18 if ( !queue || jQuery.isArray( data ) ) {
21 queue = dataPriv.access( elem, type, jQuery.makeArray( data ) ); 19 queue = data_priv.access( elem, type, jQuery.makeArray(data) );
22 } else { 20 } else {
23 queue.push( data ); 21 queue.push( data );
Line 63... Line 61...
63 }, 61 },
Line 64... Line 62...
64   62  
65 // Not public - generate a queueHooks object, or return the current one 63 // Not public - generate a queueHooks object, or return the current one
66 _queueHooks: function( elem, type ) { 64 _queueHooks: function( elem, type ) {
67 var key = type + "queueHooks"; 65 var key = type + "queueHooks";
68 return dataPriv.get( elem, key ) || dataPriv.access( elem, key, { 66 return data_priv.get( elem, key ) || data_priv.access( elem, key, {
69 empty: jQuery.Callbacks( "once memory" ).add( function() { 67 empty: jQuery.Callbacks("once memory").add(function() {
70 dataPriv.remove( elem, [ type + "queue", key ] ); 68 data_priv.remove( elem, [ type + "queue", key ] );
71 } ) 69 })
72 } ); 70 });
73 } 71 }
Line 106... Line 104...
106 } ); 104 });
107 }, 105 },
108 clearQueue: function( type ) { 106 clearQueue: function( type ) {
109 return this.queue( type || "fx", [] ); 107 return this.queue( type || "fx", [] );
110 }, 108 },
111   -  
112 // Get a promise resolved when queues of a certain type 109 // Get a promise resolved when queues of a certain type
113 // are emptied (fx is the type by default) 110 // are emptied (fx is the type by default)
114 promise: function( type, obj ) { 111 promise: function( type, obj ) {
115 var tmp, 112 var tmp,
116 count = 1, 113 count = 1,
Line 128... Line 125...
128 type = undefined; 125 type = undefined;
129 } 126 }
130 type = type || "fx"; 127 type = type || "fx";
Line 131... Line 128...
131   128  
132 while ( i-- ) { 129 while ( i-- ) {
133 tmp = dataPriv.get( elements[ i ], type + "queueHooks" ); 130 tmp = data_priv.get( elements[ i ], type + "queueHooks" );
134 if ( tmp && tmp.empty ) { 131 if ( tmp && tmp.empty ) {
135 count++; 132 count++;
136 tmp.empty.add( resolve ); 133 tmp.empty.add( resolve );
137 } 134 }