Fix cascading on array-based declarations

diff --git a/net/systemeD/halcyon/styleparser/Style.as b/net/systemeD/halcyon/styleparser/Style.as
index 3397936948ecfeb108e5eba65d6dd8d33989341d..7ee5b0033782727ddf8676a080b427d92fcbe48b 100644 (file)
--- a/net/systemeD/halcyon/styleparser/Style.as
+++ b/net/systemeD/halcyon/styleparser/Style.as
@@ -52,7 +52,8 @@ package net.systemeD.halcyon.styleparser {
                /** Merge two Style objects. */
                public function mergeWith(additional:Style):void {
                        for each (var prop:String in properties) {
                /** Merge two Style objects. */
                public function mergeWith(additional:Style):void {
                        for each (var prop:String in properties) {

-                               if (additional[prop]) {
+                               // Note extra check for empty arrays, which we use to mean 'undefined' (see setPropertyFromString below)
+                               if (additional[prop] && !((additional[prop] is Array) && additional[prop].length==0)) {

                                        this[prop]=additional[prop];
                                }
                        }
                                        this[prop]=additional[prop];
                                }
                        }