From 8fe92b94ce5e1e2857d088752d94e19db7e3d8a8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Sun, 17 Jun 2012 22:31:44 -0700 Subject: montage v11 merge into ninja Signed-off-by: Valerio Virgillito --- .../montage/ui/toggle-button.reel/toggle-button.css | 13 +++++++++++++ .../montage/ui/toggle-button.reel/toggle-button.html | 15 +++++++++++++++ .../montage/ui/toggle-button.reel/toggle-button.js | 9 ++++++--- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 node_modules/montage/ui/toggle-button.reel/toggle-button.css create mode 100644 node_modules/montage/ui/toggle-button.reel/toggle-button.html (limited to 'node_modules/montage/ui/toggle-button.reel') diff --git a/node_modules/montage/ui/toggle-button.reel/toggle-button.css b/node_modules/montage/ui/toggle-button.reel/toggle-button.css new file mode 100644 index 00000000..23c50099 --- /dev/null +++ b/node_modules/montage/ui/toggle-button.reel/toggle-button.css @@ -0,0 +1,13 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + +.montage-button.active { + background-color: #cccccc; +} + +.montage-button.active:hover { + background-color: #d8d8d8; +} diff --git a/node_modules/montage/ui/toggle-button.reel/toggle-button.html b/node_modules/montage/ui/toggle-button.reel/toggle-button.html new file mode 100644 index 00000000..7daf5273 --- /dev/null +++ b/node_modules/montage/ui/toggle-button.reel/toggle-button.html @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file 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 e12e9ba0..640f7b9b 100644 --- a/node_modules/montage/ui/toggle-button.reel/toggle-button.js +++ b/node_modules/montage/ui/toggle-button.reel/toggle-button.js @@ -16,9 +16,11 @@ var Montage = require("montage").Montage, /** The ToggleButton component extends the Button component to include state management (pressed or not pressed), and the ability to specify labels and CSS classes for each state. @class module:"montage/ui/toggle-button.reel".ToggleButton - @extends module:"montage/button.reel".Button + @extends module:"montage/ui/button.reel".Button */ var ToggleButton = exports.ToggleButton = Montage.create(Button, /** @lends module:"montage/ui/toggle-button.reel".ToggleButton# */ { + hasTemplate: {value: true}, + _pressed: { value: false }, @@ -115,11 +117,12 @@ var ToggleButton = exports.ToggleButton = Montage.create(Button, /** @lends modu */ label: { get: function() { - return Object.getOwnPropertyDescriptor(Object.getPrototypeOf(ToggleButton),"label").get.call(this); + return Object.getPropertyDescriptor(Button,"label").get.call(this); }, set: function(value) { // Call super - Object.getOwnPropertyDescriptor(Object.getPrototypeOf(ToggleButton),"label").set.call(this, value); + //Object.getOwnPropertyDescriptor(Object.getPrototypeOf(ToggleButton),"label").set.call(this, value); + Object.getPropertyDescriptor(Button, "label").set.call(this, value); if (this._pressed === true && this._label === this._unpressedLabel) { this.pressed = false; } else if (this._pressed === false && this._label === this._pressedLabel) { -- cgit v1.2.3