scratch – Diff between revs 58 and 125
?pathlinks?
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 ) { |
|
Line 7... | Line -... | |||
7 | |
- | ||
8 | "use strict"; |
- | ||
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 74... | Line 72... | |||
74 | } ); |
72 | }); |
|
75 | |
73 | |
|
76 | jQuery.fn.extend( { |
74 | jQuery.fn.extend({ |
|
Line 77... | Line 75... | |||
77 | queue: function( type, data ) { |
75 | queue: function( type, data ) { |
|
78 | var setter = 2; |
76 | var setter = 2; |
|
79 | |
77 | |
|
80 | if ( typeof type !== "string" ) { |
78 | if ( typeof type !== "string" ) { |
|
81 | data = type; |
79 | data = type; |
|
Line 82... | Line 80... | |||
82 | type = "fx"; |
80 | type = "fx"; |
|
83 | setter--; |
81 | setter--; |
|
84 | } |
82 | } |
|
Line 85... | Line 83... | |||
85 | |
83 | |
|
86 | if ( arguments.length < setter ) { |
84 | if ( arguments.length < setter ) { |
|
87 | return jQuery.queue( this[ 0 ], type ); |
85 | return jQuery.queue( this[0], type ); |
|
88 | } |
86 | } |
|
Line 89... | Line 87... | |||
89 | |
87 | |
|
90 | return data === undefined ? |
88 | return data === undefined ? |
|
Line 91... | Line 89... | |||
91 | this : |
89 | this : |
|
92 | this.each( function() { |
90 | this.each(function() { |
|
93 | var queue = jQuery.queue( this, type, data ); |
91 | var queue = jQuery.queue( this, type, data ); |
|
94 | |
92 | |
|
95 | // Ensure a hooks for this queue |
93 | // Ensure a hooks for this queue |
|
96 | jQuery._queueHooks( this, type ); |
94 | jQuery._queueHooks( this, type ); |
|
97 | |
95 | |
|
98 | if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { |
96 | if ( type === "fx" && queue[0] !== "inprogress" ) { |
|
99 | jQuery.dequeue( this, type ); |
97 | jQuery.dequeue( this, type ); |
|
100 | } |
98 | } |
|
101 | } ); |
99 | }); |
|
102 | }, |
100 | }, |
|
103 | dequeue: function( type ) { |
101 | dequeue: function( type ) { |
|
104 | return this.each( function() { |
- | ||
105 | jQuery.dequeue( this, type ); |
102 | return this.each(function() { |
|
106 | } ); |
103 | jQuery.dequeue( this, type ); |
|
107 | }, |
104 | }); |
|
108 | clearQueue: function( type ) { |
105 | }, |
|
109 | return this.queue( type || "fx", [] ); |
106 | clearQueue: function( type ) { |
|
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 | } |
|
138 | } |
135 | } |
|
139 | resolve(); |
136 | resolve(); |
|
140 | return defer.promise( obj ); |
137 | return defer.promise( obj ); |
|
141 | } |
138 | } |
|
Line 142... | Line 139... | |||
142 | } ); |
139 | }); |
|
143 | |
140 | |