diff options
author | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
commit | 3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch) | |
tree | 0ad3e94248a1d4828386c8743a670c709357a470 /js/controllers/elements/shapes-controller.js | |
parent | a0d18963d746e410511c29edd32bc1775d2d5851 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz |
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index 9fc9b576..e62af921 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -166,10 +166,10 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
166 | } | 166 | } |
167 | break; | 167 | break; |
168 | case "editStrokeMaterial": | 168 | case "editStrokeMaterial": |
169 | NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial")}); | 169 | NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial"), useSelection: true, whichMaterial: 'stroke'}); |
170 | break; | 170 | break; |
171 | case "editFillMaterial": | 171 | case "editFillMaterial": |
172 | NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial")}); | 172 | NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial"), useSelection: true, whichMaterial: 'fill'}); |
173 | break; | 173 | break; |
174 | case "animate": | 174 | case "animate": |
175 | if(value) | 175 | if(value) |