diff options
| author | Pushkar Joshi | 2012-03-27 12:43:50 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 12:43:50 -0700 |
| commit | 02a34df0ec3201199d209d43f621898b5607c150 (patch) | |
| tree | d520b35afb0a8154abe417dce232c263a89794ce /js/controllers/color-controller.js | |
| parent | 903b01b9d0501e6f974034273385a0517107b1e3 (diff) | |
| parent | 675fffb08f570783f055471501f94fc273de2b9e (diff) | |
| download | ninja-02a34df0ec3201199d209d43f621898b5607c150.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/controllers/color-controller.js')
| -rwxr-xr-x | js/controllers/color-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index 8e000b19..c6d664cf 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js | |||
| @@ -227,14 +227,14 @@ exports.ColorController = Montage.create(Component, { | |||
| 227 | // | 227 | // |
| 228 | this.fill = color; | 228 | this.fill = color; |
| 229 | // | 229 | // |
| 230 | if(e._event.wasSetByCode && mode !== 'nocolor') return; | 230 | if(e._event.wasSetByCode) return; |
| 231 | // | 231 | // |
| 232 | this.setColor(mode, color, true); | 232 | this.setColor(mode, color, true); |
| 233 | } else if (input === 'stroke') { | 233 | } else if (input === 'stroke') { |
| 234 | // | 234 | // |
| 235 | this.stroke = color; | 235 | this.stroke = color; |
| 236 | // | 236 | // |
| 237 | if(e._event.wasSetByCode && mode !== 'nocolor') return; | 237 | if(e._event.wasSetByCode) return; |
| 238 | 238 | ||
| 239 | this.setColor(mode, color, false); | 239 | this.setColor(mode, color, false); |
| 240 | } | 240 | } |