AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swap the order of the generatorFn and callbackFn args.

Browse Source 
Made the generatorFn optional, in case the source values are already ready-to-go,
although 99% of the time it's going to be better to use the generator function
to get things ready to go because MultiLoader will take care of figuring out
the sources structure.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5022 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2008-04-23 21:47:00 +00:00
parent 249c4bb42d
commit 7cd7cc48cb
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/as/com/threerings/util/MultiLoader.as
+12 -10
View File
@@ -143,15 +143,16 @@ public class MultiLoader
completeCallback(processProperty(retval, LoaderInfo, "loader")); completeCallback(processProperty(retval, LoaderInfo, "loader"));
}; };
new MultiLoader(sources, generator, complete, forEach); new MultiLoader(sources, complete, generator, forEach);
} }
/** /**
* Coordinate loading some asynchronous objects. * Coordinate loading some asynchronous objects.
* *
* @param sources An Array, Dictionary, or Object of sources, or just a single source. * @param sources An Array, Dictionary, or Object of sources, or just a single source.
* @param generatorFunciton a function to call to generate the loaders.
* @param completeCallack the function to call when complete. * @param completeCallack the function to call when complete.
* @param generatorFunciton a function to call to generate the IEventDispatchers, or
* null if the source values are already ready to go.
* @param forEach whether to call the completeCallback for each source, or all-at-once at * @param forEach whether to call the completeCallback for each source, or all-at-once at
* the end. If forEach is used, keys will never be returned. * the end. If forEach is used, keys will never be returned.
* @param isCompleteCheckFn a function to attempt to call on the dispatcher to see if * @param isCompleteCheckFn a function to attempt to call on the dispatcher to see if
@@ -161,7 +162,7 @@ public class MultiLoader
* @param completeType, the event complete type. If unspecifed @default Event.COMPLETE. * @param completeType, the event complete type. If unspecifed @default Event.COMPLETE.
*/ */
public function MultiLoader ( public function MultiLoader (
sources :Object, generatorFn :Function, completeCallback :Function, sources :Object, completeCallback :Function, generatorFn :Function = null,
forEach :Boolean = false, isCompleteCheckFn :String = null, forEach :Boolean = false, isCompleteCheckFn :String = null,
errorTypes :Array = null, completeType :String = null) errorTypes :Array = null, completeType :String = null)
{ {
@@ -193,13 +194,14 @@ public class MultiLoader
} }
for (var key :* in sources) { for (var key :* in sources) {
var sourceVal :Object = sources[key]; var val :Object = sources[key];
var val :Object; if (generatorFn != null) {
try { try {
val = (sourceVal is Array) ? generatorFn.apply(null, sourceVal as Array) val = (val is Array) ? generatorFn.apply(null, val as Array)
: generatorFn(sourceVal); : generatorFn(val);
} catch (err :Error) { } catch (err :Error) {
val = err; val = err;
}
} }
_result[key] = val; _result[key] = val;
if ((val is IEventDispatcher) && if ((val is IEventDispatcher) &&