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 | |
| 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')
88 files changed, 7616 insertions, 2888 deletions
diff --git a/node_modules/montage/ui/anchor.reel/anchor.js b/node_modules/montage/ui/anchor.reel/anchor.js new file mode 100644 index 00000000..d8ac1d8f --- /dev/null +++ b/node_modules/montage/ui/anchor.reel/anchor.js | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | var Montage = require("montage").Montage, | ||
| 7 | Component = require("ui/component").Component, | ||
| 8 | NativeControl = require("ui/native-control").NativeControl; | ||
| 9 | |||
| 10 | /** | ||
| 11 | * The <a> native control with binding support for the standard attributes | ||
| 12 | */ | ||
| 13 | var Anchor = exports.Anchor = Montage.create(NativeControl, { | ||
| 14 | |||
| 15 | }); | ||
| 16 | |||
| 17 | http://www.w3.org/TR/html5/text-level-semantics.html#the-a-element | ||
| 18 | Anchor.addAttributes({ | ||
| 19 | textContent: null, | ||
| 20 | href: null, | ||
| 21 | hreflang: null, | ||
| 22 | media: null, | ||
| 23 | rel: null, | ||
| 24 | target: null, | ||
| 25 | type: null | ||
| 26 | }); | ||
diff --git a/node_modules/montage/ui/application.js b/node_modules/montage/ui/application.js index 21449b8d..c7b3dc73 100755 --- a/node_modules/montage/ui/application.js +++ b/node_modules/montage/ui/application.js | |||
| @@ -128,15 +128,6 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta | |||
| 128 | }, | 128 | }, |
| 129 | 129 | ||
| 130 | /** | 130 | /** |
| 131 | A collection of components that the application creates at startup. | ||
| 132 | @type {Object} | ||
| 133 | @default null | ||
| 134 | */ | ||
| 135 | components: { | ||
| 136 | value: null | ||
| 137 | }, | ||
| 138 | |||
| 139 | /** | ||
| 140 | The application's delegate object.<br> | 131 | The application's delegate object.<br> |
| 141 | The application delegate is notified of events during the application's life cycle. | 132 | The application delegate is notified of events during the application's life cycle. |
| 142 | @type {Object} | 133 | @type {Object} |
| @@ -147,13 +138,6 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta | |||
| 147 | }, | 138 | }, |
| 148 | 139 | ||
| 149 | /** | 140 | /** |
| 150 | @private | ||
| 151 | */ | ||
| 152 | _template: { | ||