From: Richard Fairhurst <richard@systemeD.net>
Date: Mon, 3 Oct 2011 11:43:41 +0000 (+0100)
Subject: Fix cascading on array-based declarations
X-Git-Url: https://git.openstreetmap.org/potlatch2.git/commitdiff_plain/8e6ff535eaca9da2c6a2a0109d22f037b0454777

Fix cascading on array-based declarations
---

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];
 				}
 			}