diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/ui/toggle-button.reel/toggle-button.js | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/toggle-button.reel/toggle-button.js')
-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 |