From 7cd7cc48cb2838ec1ce838b8ffc098706af2165a Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 23 Apr 2008 21:47:00 +0000
Subject: [PATCH] Swap the order of the generatorFn and callbackFn args. 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
---
 src/as/com/threerings/util/MultiLoader.as | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/as/com/threerings/util/MultiLoader.as b/src/as/com/threerings/util/MultiLoader.as
index 93c32b24e..dd35e51ba 100644
--- a/src/as/com/threerings/util/MultiLoader.as
+++ b/src/as/com/threerings/util/MultiLoader.as
@@ -143,15 +143,16 @@ public class MultiLoader
             completeCallback(processProperty(retval, LoaderInfo, "loader"));
         };
 
-        new MultiLoader(sources, generator, complete, forEach);
+        new MultiLoader(sources, complete, generator, forEach);
     }
 
     /**
      * Coordinate loading some asynchronous objects.
      *
      * @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 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
      * 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
@@ -161,7 +162,7 @@ public class MultiLoader
      * @param completeType, the event complete type. If unspecifed @default Event.COMPLETE.
      */
     public function MultiLoader (
-        sources :Object, generatorFn :Function, completeCallback :Function,
+        sources :Object, completeCallback :Function, generatorFn :Function = null,
         forEach :Boolean = false, isCompleteCheckFn :String = null,
         errorTypes :Array = null, completeType :String = null)
     {
@@ -193,13 +194,14 @@ public class MultiLoader
         }
 
         for (var key :* in sources) {
-            var sourceVal :Object = sources[key];
-            var val :Object;
-            try {
-                val = (sourceVal is Array) ? generatorFn.apply(null, sourceVal as Array)
-                                           : generatorFn(sourceVal);
-            } catch (err :Error) {
-                val = err;
+            var val :Object = sources[key];
+            if (generatorFn != null) {
+                try {
+                    val = (val is Array) ? generatorFn.apply(null, val as Array)
+                                         : generatorFn(val);
+                } catch (err :Error) {
+                    val = err;
+                }
             }
             _result[key] = val;
             if ((val is IEventDispatcher) &&