From d52aca45e0357b5597e13d9b74998abb75fabea5 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 16 Feb 2012 10:54:48 -0800 Subject: integrating the latest montage fixes for v0.6 into master Signed-off-by: Valerio Virgillito --- node_modules/montage/ui/toggle-button.reel/toggle-button.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'node_modules/montage/ui/toggle-button.reel') 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, { } }, - deserializedFromTemplate: { + didSetElement: { value: function() { - Object.getPrototypeOf(ToggleButton).deserializedFromTemplate.call(this); + Object.getPrototypeOf(ToggleButton).didSetElement.call(this); // If we haven't set the (un)pressedLabel of the initial state, // then take it from the label -- cgit v1.2.3