aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-12 12:00:07 -0700
committerNivesh Rajbhandari2012-03-12 12:00:07 -0700
commit2c6339a9191033c937c2bac3e181c2bc380f4c48 (patch)
treef5b6b66c578d77f3db3373ff9521519d107fc33a /js/panels
parente44238821c6b19a4b2259d26e14847b9995338f2 (diff)
downloadninja-2c6339a9191033c937c2bac3e181c2bc380f4c48.tar.gz
Fixed element mediator, PI, and eye-dropper to handle different borders sides and gradients.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/properties.reel/properties.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index eb9faa8b..947d7937 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -302,13 +302,15 @@ exports.Properties = Montage.create(Component, {
302 } 302 }
303 else 303 else
304 { 304 {
305 currentValue = ElementsMediator.getColor2(el, control.prop, control.valueMutator);
306 if(control.prop === "border") 305 if(control.prop === "border")
307 { 306 {
307 // TODO - For now, always return the top border if multiple border sides
308 currentValue = ElementsMediator.getColor(el, false, "top");
308 this.application.ninja.colorController.colorModel.input = "stroke"; 309 this.application.ninja.colorController.colorModel.input = "stroke";
309 } 310 }
310 else if(control.prop === "background") 311 else if(control.prop === "background")
311 { 312 {
313 currentValue = ElementsMediator.getColor(el, true);
312 this.application.ninja.colorController.colorModel.input = "fill"; 314 this.application.ninja.colorController.colorModel.input = "fill";
313 } 315 }
314 316