diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/components/button.reel | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/components/button.reel')
| -rw-r--r-- | js/components/button.reel/button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/button.reel/button.js b/js/components/button.reel/button.js index ce5ac1af..2d26c8b4 100644 --- a/js/components/button.reel/button.js +++ b/js/components/button.reel/button.js | |||
| @@ -179,7 +179,7 @@ var Button = exports.Button = Montage.create(Component, { | |||
| 179 | value: function() { | 179 | value: function() { |
| 180 | if(this.isToggleButton) | 180 | if(this.isToggleButton) |
| 181 | { | 181 | { |
| 182 | if(this._value) | 182 | if(this._value === true) |
| 183 | { | 183 | { |
| 184 | this.element.classList.remove(this.offState); | 184 | this.element.classList.remove(this.offState); |
| 185 | this.element.classList.add(this.onState); | 185 | this.element.classList.add(this.onState); |