diff options
| author | Eric Guzman | 2012-02-16 14:20:40 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-16 14:20:40 -0800 |
| commit | 6960f62a84b946c92a59e5f5dc537a818f9f62b8 (patch) | |
| tree | 49cbff3fdd8dab11846e5a278406915ec0ec1508 /node_modules/montage/ui/toggle-button.reel | |
| parent | 82b1a273219f0ae3d119e156c7acccdbe478f441 (diff) | |
| parent | 81942bd52f0713c9ff5d479ebd12fce577f45e45 (diff) | |
| download | ninja-6960f62a84b946c92a59e5f5dc537a818f9f62b8.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'node_modules/montage/ui/toggle-button.reel')
| -rw-r--r-- | node_modules/montage/ui/toggle-button.reel/toggle-button.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/toggle-button.reel/toggle-button.js b/node_modules/montage/ui/toggle-button.reel/toggle-button.js index f8f3c0fa..518a4d74 100644 --- a/node_modules/montage/ui/toggle-button.reel/toggle-button.js +++ b/node_modules/montage/ui/toggle-button.reel/toggle-button.js | |||
| @@ -124,9 +124,9 @@ var ToggleButton = exports.ToggleButton = Montage.create(Button, { | |||
| 124 | } | 124 | } |
| 125 | }, | 125 | }, |
| 126 | 126 | ||
| 127 | deserializedFromTemplate: { | 127 | didSetElement: { |
| 128 | value: function() { | 128 | value: function() { |
| 129 | Object.getPrototypeOf(ToggleButton).deserializedFromTemplate.call(this); | 129 | Object.getPrototypeOf(ToggleButton).didSetElement.call(this); |
| 130 | 130 | ||
| 131 | // If we haven't set the (un)pressedLabel of the initial state, | 131 | // If we haven't set the (un)pressedLabel of the initial state, |
| 132 | // then take it from the label | 132 | // then take it from the label |