From a3024011a91d3941f81481dd4d600e9684eb0fd4 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 2 Feb 2012 00:11:51 -0800 Subject: upgrading to Montage v0.6 Signed-off-by: Valerio Virgillito --- node_modules/montage/ui/popup/confirm.reel/confirm.css | 2 +- node_modules/montage/ui/popup/confirm.reel/confirm.html | 16 ++++++++-------- node_modules/montage/ui/popup/confirm.reel/confirm.js | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'node_modules/montage/ui/popup/confirm.reel') diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.css b/node_modules/montage/ui/popup/confirm.reel/confirm.css index 8d326cce..959cf719 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.css +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.css @@ -3,7 +3,7 @@ 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-confirm-dialog { min-width: 300px; } diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html index 209fdc86..63b521bd 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.html +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html @@ -29,7 +29,7 @@ } }, "button1": { - "module": "montage/ui/button.reel", + "module": "montage/ui/bluemoon/button.reel", "name": "Button", "properties": { "identifier": "Ok", @@ -56,7 +56,7 @@ ] }, "button2": { - "module": "montage/ui/button.reel", + "module": "montage/ui/bluemoon/button.reel", "name": "Button", "properties": { "identifier": "Cancel", @@ -98,20 +98,20 @@
- +

Confirmation

- +
-
+
- +
-
-
+ +
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.js b/node_modules/montage/ui/popup/confirm.reel/confirm.js index 8e1660c5..7e186e29 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.js +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.js @@ -34,7 +34,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon msg: { value: 'Are you sure?' }, - + /** Text to display on the OK button @type {Property} @@ -43,7 +43,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon okLabel: { value: 'OK' }, - + /** Text to display on the Cancel button @type {Property} @@ -52,7 +52,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon cancelLabel: { value: 'Cancel' }, - + /** Description TODO @private @@ -164,9 +164,9 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon confirm = Confirm.create(); popup.content = confirm; } - + confirm = popup.content; - + if (typeof(options) === "string") { confirm.msg = options; confirm.okLabel = "OK"; @@ -176,7 +176,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon confirm.okLabel = options.okLabel || "OK"; confirm.cancelLabel = options.cancelLabel || "Cancel"; } - + confirm.okCallback = okCallback || null; confirm.cancelCallback = cancelCallback || null; -- cgit v1.2.3