From 8e6ff535eaca9da2c6a2a0109d22f037b0454777 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Mon, 3 Oct 2011 12:43:41 +0100 Subject: [PATCH] Fix cascading on array-based declarations --- net/systemeD/halcyon/styleparser/Style.as | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/systemeD/halcyon/styleparser/Style.as b/net/systemeD/halcyon/styleparser/Style.as index 33979369..7ee5b003 100644 --- 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) { - 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]; } } -- 2.30.0