Add onFilesLoaded to FileBank to handle callbacks

We can't use rely on the FILES_LOADED event because if there are no
files to load it will never fire, so introduce a new routine that will
do an immediate callback in that case, and a deferred one otherwise.

diff --git a/net/systemeD/halcyon/FileBank.as b/net/systemeD/halcyon/FileBank.as
index d82a2d713dbcc84d4f85e32f1ddbe7a90ce74924..2f277de09fc57acbb44ef85e9d44b256497b8290 100755 (executable)
--- a/net/systemeD/halcyon/FileBank.as
+++ b/net/systemeD/halcyon/FileBank.as
@@ -56,7 +56,17 @@ package net.systemeD.halcyon {
                        }
                }
 
-               private function loadedImage(event:Event):void {
+        public function onFilesLoaded(callback:Function):void {
+            if (filesRequested > filesReceived) {
+                addEventListener(FileBank.FILES_LOADED, function(e:Event):void {
+                    callback();
+                });
+            } else {
+                callback();
+            }
+        }
+
+        private function loadedImage(event:Event):void {
                        fileReceived();
                }
                private function httpStatusHandler(event:HTTPStatusEvent):void { }
@@ -170,4 +180,4 @@ package net.systemeD.halcyon {
                }
 
        }
-}
\ No newline at end of file
+}

diff --git a/net/systemeD/halcyon/styleparser/RuleSet.as b/net/systemeD/halcyon/styleparser/RuleSet.as
index d0842145ce594d55702a28b1c891750a8de6e025..83f197ba4eda6ca360efe0e8d7e52ac7d15e63ee 100644 (file)
--- a/net/systemeD/halcyon/styleparser/RuleSet.as
+++ b/net/systemeD/halcyon/styleparser/RuleSet.as
@@ -294,7 +294,6 @@ package net.systemeD.halcyon.styleparser {
                /** Load all images referenced in the RuleSet (for example, icons or bitmap fills). */
                
                private function loadImages():void {
-                       FileBank.getInstance().addEventListener(FileBank.FILES_LOADED,doIconCallback);
                        var filename:String;
                        for each (var chooser:StyleChooser in choosers) {
                                for each (var style:Style in chooser.styles) {
@@ -307,10 +306,7 @@ package net.systemeD.halcyon.styleparser {
                                                FileBank.getInstance().addFromFile(filename);
                                }
                        }
-               }
-               
-               private function doIconCallback(e:Event):void {
-                       iconCallback();
+            FileBank.getInstance().onFilesLoaded(iconCallback);
                }
                
                // ------------------------------------------------------------------------------------------------