Skip to content

Commit 4ddd9d2

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents 9100823 + 50e55cd commit 4ddd9d2

5 files changed

Lines changed: 62 additions & 58 deletions

File tree

src/structs/List.js

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var List = new Class({
4747
/**
4848
* The objects that belong to this collection.
4949
*
50-
* @genericUse {T[]} T - [$type]
50+
* @genericUse {T[]} - [$type]
5151
*
5252
* @name Phaser.Structs.List#list
5353
* @type {Array.<*>}
@@ -73,7 +73,7 @@ var List = new Class({
7373
* @method Phaser.Structs.List#add
7474
* @since 3.0.0
7575
*
76-
* @genericUse {T} T - [child,$return]
76+
* @genericUse {T} - [child,$return]
7777
*
7878
* @param {*} child - [description]
7979
*
@@ -97,7 +97,7 @@ var List = new Class({
9797
* @method Phaser.Structs.List#addAt
9898
* @since 3.0.0
9999
*
100-
* @genericUse {T} T - [child,$return]
100+
* @genericUse {T} - [child,$return]
101101
*
102102
* @param {*} child - [description]
103103
* @param {integer} [index=0] - [description]
@@ -130,7 +130,7 @@ var List = new Class({
130130
* @method Phaser.Structs.List#addMultiple
131131
* @since 3.0.0
132132
*
133-
* @genericUse {T[]} T - [children,$return]
133+
* @genericUse {T[]} - [children,$return]
134134
*
135135
* @param {Array.<*>} children - [description]
136136
*
@@ -155,7 +155,7 @@ var List = new Class({
155155
* @method Phaser.Structs.List#getAt
156156
* @since 3.0.0
157157
*
158-
* @genericUse {T} T - [$return]
158+
* @genericUse {T} - [$return]
159159
*
160160
* @param {integer} index - [description]
161161
*
@@ -172,7 +172,7 @@ var List = new Class({
172172
* @method Phaser.Structs.List#getIndex
173173
* @since 3.0.0
174174
*
175-
* @genericUse {T} T - [child]
175+
* @genericUse {T} - [child]
176176
*
177177
* @param {*} child - [description]
178178
*
@@ -191,7 +191,7 @@ var List = new Class({
191191
* @method Phaser.Structs.List#sort
192192
* @since 3.0.0
193193
*
194-
* @genericUse {T[]} T - [children,$return]
194+
* @genericUse {T[]} - [children,$return]
195195
*
196196
* @param {Array.<*>} children - [description]
197197
*
@@ -210,7 +210,7 @@ var List = new Class({
210210
* @method Phaser.Structs.List#sortIndexHandler
211211
* @since 3.0.0
212212
*
213-
* @genericUse {T} T - [childA,childB]
213+
* @genericUse {T} - [childA,childB]
214214
*
215215
* @param {*} childA - [description]
216216
* @param {*} childB - [description]
@@ -244,8 +244,8 @@ var List = new Class({
244244
* @method Phaser.Structs.List#getByKey
245245
* @since 3.0.0
246246
*
247-
* @genericUse {T} T - [value]
248-
* @genericUse {?T} T - [$return]
247+
* @genericUse {T} - [value]
248+
* @genericUse {?T} - [$return]
249249
*
250250
* @param {string} property - The property to check against the value.
251251
* @param {*} value - The value to check if the property strictly equals.
@@ -273,7 +273,7 @@ var List = new Class({
273273
* @method Phaser.Structs.List#getByName
274274
* @since 3.0.0
275275
*
276-
* @genericUse {?T} T - [$return]
276+
* @genericUse {?T} - [$return]
277277
*
278278
* @param {string} name - The name to search for.
279279
*
@@ -290,7 +290,7 @@ var List = new Class({
290290
* @method Phaser.Structs.List#getRandom
291291
* @since 3.0.0
292292
*
293-
* @genericUse {?T} T - [$return]
293+
* @genericUse {?T} - [$return]
294294
*
295295
* @param {integer} [startIndex=0] - Offset from the front of the group (lowest child).
296296
* @param {integer} [length=(to top)] - Restriction on the number of values you want to randomly select from.
@@ -318,8 +318,8 @@ var List = new Class({
318318
* @method Phaser.Structs.List#getFirst
319319
* @since 3.0.0
320320
*
321-
* @genericUse {T} T - [value]
322-
* @genericUse {?T} T - [$return]
321+
* @genericUse {T} - [value]
322+
* @genericUse {?T} - [$return]
323323
*
324324
* @param {string} property - [description]
325325
* @param {*} value - [description]
@@ -360,8 +360,8 @@ var List = new Class({
360360
* @method Phaser.Structs.List#getAll
361361
* @since 3.0.0
362362
*
363-
* @genericUse {T} T - [value]
364-
* @genericUse {T[]} T - [$return]
363+
* @genericUse {T} - [value]
364+
* @genericUse {T[]} - [$return]
365365
*
366366
* @param {string} [property] - An optional property to test against the value argument.
367367
* @param {*} [value] - If property is set then Child.property must strictly equal this value to be included in the results.
@@ -403,7 +403,7 @@ var List = new Class({
403403
* @method Phaser.Structs.List#count
404404
* @since 3.0.0
405405
*
406-
* @genericUse {T} T - [value]
406+
* @genericUse {T} - [value]
407407
*
408408
* @param {string} property - [description]
409409
* @param {*} value - [description]
@@ -433,7 +433,7 @@ var List = new Class({
433433
* @method Phaser.Structs.List#swap
434434
* @since 3.0.0
435435
*
436-
* @genericUse {T} T - [child1,child2]
436+
* @genericUse {T} - [child1,child2]
437437
*
438438
* @param {*} child1 - [description]
439439
* @param {*} child2 - [description]
@@ -463,7 +463,7 @@ var List = new Class({
463463
* @method Phaser.Structs.List#moveTo
464464
* @since 3.0.0
465465
*
466-
* @genericUse {T} T - [child,$return]
466+
* @genericUse {T} - [child,$return]
467467
*
468468
* @param {*} child - [description]
469469
* @param {integer} index - [description]
@@ -494,7 +494,7 @@ var List = new Class({
494494
* @method Phaser.Structs.List#remove
495495
* @since 3.0.0
496496
*
497-
* @genericUse {T} T - [child,$return]
497+
* @genericUse {T} - [child,$return]
498498
*
499499
* @param {*} child - [description]
500500
*
@@ -518,7 +518,7 @@ var List = new Class({
518518
* @method Phaser.Structs.List#removeAt
519519
* @since 3.0.0
520520
*
521-
* @genericUse {T} T - [$return]
521+
* @genericUse {T} - [$return]
522522
*
523523
* @param {integer} index - [description]
524524
*
@@ -542,7 +542,7 @@ var List = new Class({
542542
* @method Phaser.Structs.List#removeBetween
543543
* @since 3.0.0
544544
*
545-
* @genericUse {T[]} T - [$return]
545+
* @genericUse {T[]} - [$return]
546546
*
547547
* @param {integer} [beginIndex=0] - [description]
548548
* @param {integer} [endIndex] - [description]
@@ -598,7 +598,7 @@ var List = new Class({
598598
* @method Phaser.Structs.List#bringToTop
599599
* @since 3.0.0
600600
*
601-
* @generic {T} T - [child,$return]
601+
* @generic {T} O - [child,$return]
602602
*
603603
* @param {*} child - [description]
604604
*
@@ -621,7 +621,7 @@ var List = new Class({
621621
* @method Phaser.Structs.List#sendToBack
622622
* @since 3.0.0
623623
*
624-
* @generic {T} T - [child,$return]
624+
* @generic {T} O - [child,$return]
625625
*
626626
* @param {*} child - [description]
627627
*
@@ -644,7 +644,7 @@ var List = new Class({
644644
* @method Phaser.Structs.List#moveUp
645645
* @since 3.0.0
646646
*
647-
* @generic {T} T - [child,$return]
647+
* @generic {T} O - [child,$return]
648648
*
649649
* @param {*} child - [description]
650650
*
@@ -673,7 +673,7 @@ var List = new Class({
673673
* @method Phaser.Structs.List#moveDown
674674
* @since 3.0.0
675675
*
676-
* @generic {T} T - [child,$return]
676+
* @generic {T} O - [child,$return]
677677
*
678678
* @param {*} child - [description]
679679
*
@@ -738,8 +738,7 @@ var List = new Class({
738738
* @method Phaser.Structs.List#replace
739739
* @since 3.0.0
740740
*
741-
* @generic {T} T - [oldChild,$return]
742-
* @genericUse {T} T - [newChild]
741+
* @generic {T} O - [oldChild,newChild,$return]
743742
*
744743
* @param {*} oldChild - The child in this List that will be replaced.
745744
* @param {*} newChild - The child to be inserted into this List.
@@ -766,7 +765,7 @@ var List = new Class({
766765
* @method Phaser.Structs.List#exists
767766
* @since 3.0.0
768767
*
769-
* @genericUse {T} T - [child]
768+
* @genericUse {T} - [child]
770769
*
771770
* @param {*} child - [description]
772771
*
@@ -783,7 +782,7 @@ var List = new Class({
783782
* @method Phaser.Structs.List#setAll
784783
* @since 3.0.0
785784
*
786-
* @genericUse {T} T - [value]
785+
* @genericUse {T} - [value]
787786
*
788787
* @param {string} key - [description]
789788
* @param {*} value - [description]
@@ -805,7 +804,9 @@ var List = new Class({
805804
* @method Phaser.Structs.List#each
806805
* @since 3.0.0
807806
*
808-
* @param {EachListCallback.<T>} callback - The function to call.
807+
* @genericUse {EachListCallback.<T>} - [callback]
808+
*
809+
* @param {EachListCallback} callback - The function to call.
809810
* @param {*} [thisArg] - Value to use as `this` when executing callback.
810811
* @param {...*} [args] - Additional arguments that will be passed to the callback, after the child.
811812
*/

src/structs/Map.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var Class = require('../utils/Class');
3131
* @since 3.0.0
3232
*
3333
* @generic T
34-
* @genericUse {T[]} T - [elements]
34+
* @genericUse {T[]} - [elements]
3535
*
3636
* @param {Array.<*>} elements - [description]
3737
*/
@@ -44,7 +44,7 @@ var Map = new Class({
4444
/**
4545
* [description]
4646
*
47-
* @genericUse {Object.<string, T>} T - [$type]
47+
* @genericUse {Object.<string, T>} - [$type]
4848
*
4949
* @name Phaser.Structs.Map#entries
5050
* @type {Object.<string, *>}
@@ -78,7 +78,7 @@ var Map = new Class({
7878
* @method Phaser.Structs.Map#set
7979
* @since 3.0.0
8080
*
81-
* @genericUse {T} T - [value]
81+
* @genericUse {T} - [value]
8282
*
8383
* @param {string} key - [description]
8484
* @param {*} value - [description]
@@ -102,7 +102,7 @@ var Map = new Class({
102102
* @method Phaser.Structs.Map#get
103103
* @since 3.0.0
104104
*
105-
* @genericUse {T} T - [$return]
105+
* @genericUse {T} - [$return]
106106
*
107107
* @param {string} key - [description]
108108
*
@@ -122,7 +122,7 @@ var Map = new Class({
122122
* @method Phaser.Structs.Map#getArray
123123
* @since 3.0.0
124124
*
125-
* @genericUse {T[]} T - [$return]
125+
* @genericUse {T[]} - [$return]
126126
*
127127
* @return {Array.<*>} [description]
128128
*/
@@ -215,7 +215,7 @@ var Map = new Class({
215215
* @method Phaser.Structs.Map#values
216216
* @since 3.0.0
217217
*
218-
* @genericUse {T[]} T - [$return]
218+
* @genericUse {T[]} - [$return]
219219
*
220220
* @return {Array.<*>} [description]
221221
*/
@@ -260,7 +260,9 @@ var Map = new Class({
260260
* @method Phaser.Structs.Map#each
261261
* @since 3.0.0
262262
*
263-
* @param {EachMapCallback.<T>} callback - [description]
263+
* @genericUse {EachMapCallback.<T>} - [callback]
264+
*
265+
* @param {EachMapCallback} callback - [description]
264266
*
265267
* @return {Phaser.Structs.Map} This Map object.
266268
*/
@@ -285,7 +287,7 @@ var Map = new Class({
285287
* @method Phaser.Structs.Map#contains
286288
* @since 3.0.0
287289
*
288-
* @genericUse {T} T - [value]
290+
* @genericUse {T} - [value]
289291
*
290292
* @param {*} value - [description]
291293
*

src/structs/ProcessQueue.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var ProcessQueue = new Class({
2626
/**
2727
* [description]
2828
*
29-
* @genericUse {T[]} T - [$type]
29+
* @genericUse {T[]} - [$type]
3030
*
3131
* @name Phaser.Structs.ProcessQueue#_pending
3232
* @type {Array.<*>}
@@ -39,7 +39,7 @@ var ProcessQueue = new Class({
3939
/**
4040
* [description]
4141
*
42-
* @genericUse {T[]} T - [$type]
42+
* @genericUse {T[]} - [$type]
4343
*
4444
* @name Phaser.Structs.ProcessQueue#_active
4545
* @type {Array.<*>}
@@ -52,7 +52,7 @@ var ProcessQueue = new Class({
5252
/**
5353
* [description]
5454
*
55-
* @genericUse {T[]} T - [$type]
55+
* @genericUse {T[]} - [$type]
5656
*
5757
* @name Phaser.Structs.ProcessQueue#_destroy
5858
* @type {Array.<*>}
@@ -80,7 +80,7 @@ var ProcessQueue = new Class({
8080
* @method Phaser.Structs.ProcessQueue#add
8181
* @since 3.0.0
8282
*
83-
* @genericUse {T} T - [item]
83+
* @genericUse {T} - [item]
8484
*
8585
* @param {*} item - [description]
8686
*
@@ -101,7 +101,7 @@ var ProcessQueue = new Class({
101101
* @method Phaser.Structs.ProcessQueue#remove
102102
* @since 3.0.0
103103
*
104-
* @genericUse {T} T - [item]
104+
* @genericUse {T} - [item]
105105
*
106106
* @param {*} item - [description]
107107
*
@@ -122,7 +122,7 @@ var ProcessQueue = new Class({
122122
* @method Phaser.Structs.ProcessQueue#update
123123
* @since 3.0.0
124124
*
125-
* @genericUse {T[]} T - [$return]
125+
* @genericUse {T[]} - [$return]
126126
*
127127
* @return {Array.<*>} [description]
128128
*/
@@ -181,7 +181,7 @@ var ProcessQueue = new Class({
181181
* @method Phaser.Structs.ProcessQueue#getActive
182182
* @since 3.0.0
183183
*
184-
* @genericUse {T[]} T - [$return]
184+
* @genericUse {T[]} - [$return]
185185
*
186186
* @return {Array.<*>} [description]
187187
*/

0 commit comments

Comments
 (0)