diff options
author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/popup/confirm.reel/confirm.js | |
parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/confirm.reel/confirm.js')
-rwxr-xr-x | node_modules/montage/ui/popup/confirm.reel/confirm.js | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
34 | msg: { | 34 | msg: { |
35 | value: 'Are you sure?' | 35 | value: 'Are you sure?' |
36 | }, | 36 | }, |
37 | 37 | ||
38 | /** | 38 | /** |
39 | Text to display on the OK button | 39 | Text to display on the OK button |
40 | @type {Property} | 40 | @type {Property} |
@@ -43,7 +43,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon | |||
43 | okLabel: { | 43 | okLabel: { |
44 | value: 'OK' | 44 | value: 'OK' |
45 | }, | 45 | }, |
46 | 46 | ||
47 | /** | 47 | /** |
48 | Text to display on the Cancel button | 48 | Text to display on the Cancel button |
49 | @type {Property} | 49 | @type {Property} |
@@ -52,7 +52,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon | |||
52 | cancelLabel: { | 52 | cancelLabel: { |
53 | value: 'Cancel' | 53 | value: 'Cancel' |
54 | }, | 54 | }, |
55 | 55 | ||
56 | /** | 56 | /** |
57 | Description TODO | 57 | Description TODO |
58 | @private | 58 | @private |
@@ -164,9 +164,9 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon | |||
164 | confirm = Confirm.create(); | 164 | confirm = Confirm.create(); |
165 | popup.content = confirm; | 165 | popup.content = confirm; |
166 | } | 166 | } |
167 | 167 | ||
168 | confirm = popup.content; | 168 | confirm = popup.content; |
169 | 169 | ||
170 | if (typeof(options) === "string") { | 170 | if (typeof(options) === "string") { |
171 | confirm.msg = options; | 171 | confirm.msg = options; |
172 | confirm.okLabel = "OK"; | 172 | confirm.okLabel = "OK"; |
@@ -176,7 +176,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon | |||
176 | confirm.okLabel = options.okLabel || "OK"; | 176 | confirm.okLabel = options.okLabel || "OK"; |
177 | confirm.cancelLabel = options.cancelLabel || "Cancel"; | 177 | confirm.cancelLabel = options.cancelLabel || "Cancel"; |
178 | } | 178 | } |
179 | 179 | ||
180 | confirm.okCallback = okCallback || null; | 180 | confirm.okCallback = okCallback || null; |
181 | confirm.cancelCallback = cancelCallback || null; | 181 | confirm.cancelCallback = cancelCallback || null; |
182 | 182 | ||