diff options
author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/tools/FillTool.js | |
parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/FillTool.js')
-rwxr-xr-x | js/tools/FillTool.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js index fabcec69..46d76a19 100755 --- a/js/tools/FillTool.js +++ b/js/tools/FillTool.js | |||
@@ -63,15 +63,14 @@ exports.FillTool = Montage.create(ModifierToolBase, { | |||
63 | colorInfo = { mode:color.colorMode, | 63 | colorInfo = { mode:color.colorMode, |
64 | color:color.color | 64 | color:color.color |
65 | }; | 65 | }; |
66 | ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool"); | ||
67 | } | 66 | } |
68 | else | 67 | else |
69 | { | 68 | { |
70 | colorInfo = { mode:"nocolor", | 69 | colorInfo = { mode:"nocolor", |
71 | color:color.color | 70 | color:color.color |
72 | }; | 71 | }; |
73 | ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool"); | ||
74 | } | 72 | } |
73 | ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool"); | ||
75 | } | 74 | } |
76 | } | 75 | } |
77 | } | 76 | } |