aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-13 11:16:47 -0700
committerValerio Virgillito2012-03-13 11:16:47 -0700
commit9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (patch)
treedac91cf9c9f65b33886160db3aae364873a4352b /js/panels/properties.reel
parent91335d6572a611ecde7a71dbbfdb82bdb40f7e2b (diff)
parent2ac9a855724cc4ccf147ce4130a733a84cc647c3 (diff)
downloadninja-9f3307810541ca6f95d7ca6d1febe8afdcd2c101.tar.gz
Merge pull request #110 from mqg734/WebGLFixes
Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool
Diffstat (limited to 'js/panels/properties.reel')
-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