aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ShapeTool.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-07-02 13:19:20 -0700
committerArmen Kesablyan2012-07-02 13:19:20 -0700
commit526b9d76686323f488f1b26175440172b715d808 (patch)
tree47fc6bd90715b403a08d08a48a86f4d24da1ba29 /js/tools/ShapeTool.js
parentb194664df7e01aaeb8d1e7220a6de0e7f879f1db (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-526b9d76686323f488f1b26175440172b715d808.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-xjs/tools/ShapeTool.js16
1 files changed, 15 insertions, 1 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 8d381711..3cd75be2 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -209,7 +209,21 @@ exports.ShapeTool = Montage.create(DrawingTool, {
209 209
210 return target; 210 return target;
211 } 211 }
212 } 212 },
213
214 setColor: {
215 value: function(canvas, color, isFill, toolId)
216 {
217 if(color && color.color)
218 {
219 this.application.ninja.elementMediator.setColor([canvas], {mode:color.colorMode, color:color.color}, isFill, "Change", toolId);
220 }
221 else
222 {
223 this.application.ninja.elementMediator.setColor([canvas], {mode:"nocolor", color:null}, isFill, "Change", toolId);
224 }
225 }
226 }
213 227
214}); 228});
215 229