diff options
| author | Valerio Virgillito | 2012-02-16 10:54:48 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-16 10:54:48 -0800 |
| commit | d52aca45e0357b5597e13d9b74998abb75fabea5 (patch) | |
| tree | ffd4a0c060b00611953b7e3ed0b3955bf02ac6e7 /node_modules/montage/ui/toggle-button.reel | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-d52aca45e0357b5597e13d9b74998abb75fabea5.tar.gz | |
integrating the latest montage fixes for v0.6 into master
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 |