From bedb38e14887b29eae3cdf1c8d435259c920257c Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 12 Jun 2012 13:05:12 -0700 Subject: Sub Props Signed-off-by: Kruti Shah --- js/controllers/elements/element-controller.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'js/controllers/elements') diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index f37a9249..da8afbaa 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js @@ -99,9 +99,9 @@ exports.ElementController = Montage.create(Component, { // Return cached value if one exists if(isFill) { - if(el.elementModel.fill) { - return el.elementModel.fill; - } +// if(el.elementModel.fill) { +// return el.elementModel.fill; +// } //TODO: Once logic for color and gradient is established, this needs to be revised color = this.getProperty(el, "background-color"); image = this.getProperty(el, "background-image"); @@ -114,9 +114,9 @@ exports.ElementController = Montage.create(Component, { // If no color was found, look up the shared border color if(!color && !image) { - if(el.elementModel.stroke) { - return el.elementModel.stroke; - } +// if(el.elementModel.stroke) { +// return el.elementModel.stroke; +// } color = this.getProperty(el, "border-color"); image = this.getProperty(el, "border-image"); -- cgit v1.2.3