aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/element-controller.js12
1 files changed, 6 insertions, 6 deletions
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, {
99 99
100 // Return cached value if one exists 100 // Return cached value if one exists
101 if(isFill) { 101 if(isFill) {
102 if(el.elementModel.fill) { 102// if(el.elementModel.fill) {
103 return el.elementModel.fill; 103// return el.elementModel.fill;
104 } 104// }
105 //TODO: Once logic for color and gradient is established, this needs to be revised 105 //TODO: Once logic for color and gradient is established, this needs to be revised
106 color = this.getProperty(el, "background-color"); 106 color = this.getProperty(el, "background-color");
107 image = this.getProperty(el, "background-image"); 107 image = this.getProperty(el, "background-image");
@@ -114,9 +114,9 @@ exports.ElementController = Montage.create(Component, {
114 114
115 // If no color was found, look up the shared border color 115 // If no color was found, look up the shared border color
116 if(!color && !image) { 116 if(!color && !image) {
117 if(el.elementModel.stroke) { 117// if(el.elementModel.stroke) {
118 return el.elementModel.stroke; 118// return el.elementModel.stroke;
119 } 119// }
120 120
121 color = this.getProperty(el, "border-color"); 121 color = this.getProperty(el, "border-color");
122 image = this.getProperty(el, "border-image"); 122 image = this.getProperty(el, "border-image");