diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui')
64 files changed, 3365 insertions, 1190 deletions
diff --git a/node_modules/montage/ui/anchor.reel/anchor.js b/node_modules/montage/ui/anchor.reel/anchor.js index d8ac1d8f..2c12684b 100644 --- a/node_modules/montage/ui/anchor.reel/anchor.js +++ b/node_modules/montage/ui/anchor.reel/anchor.js | |||
@@ -3,24 +3,78 @@ | |||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<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. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | |||
7 | /** | ||
8 | @module "montage/ui/anchor.reel" | ||
9 | @requires montage/core/core | ||
10 | @requires montage/ui/native-control | ||
11 | */ | ||
6 | var Montage = require("montage").Montage, | 12 | var Montage = require("montage").Montage, |
7 | Component = require("ui/component").Component, | 13 | Component = require("ui/component").Component, |
8 | NativeControl = require("ui/native-control").NativeControl; | 14 | NativeControl = require("ui/native-control").NativeControl; |
9 | |||
10 | /** | 15 | /** |
11 | * The <a> native control with binding support for the standard attributes | 16 | The Anchor component wraps a native <code><a></code> element and exposes its standard attributes as bindable properties. |
12 | */ | 17 | @class module:"montage/ui/anchor.reel".Anchor |
18 | @extends module:montage/native-control.NativeControl | ||
19 | |||
20 | */ | ||
13 | var Anchor = exports.Anchor = Montage.create(NativeControl, { | 21 | var Anchor = exports.Anchor = Montage.create(NativeControl, { |
14 | 22 | ||
23 | // HTMLAnchorElement methods | ||
24 | |||
25 | blur: { value: function() { this._element.blur(); } }, | ||
26 | focus: { value: function() { this._element.focus(); } } | ||
27 | |||
15 | }); | 28 | }); |
16 | 29 | ||
17 | http://www.w3.org/TR/html5/text-level-semantics.html#the-a-element | 30 | Anchor.addAttributes( /** @lends module:"montage/ui/anchor.reel".Anchor# */ { |
18 | Anchor.addAttributes({ | 31 | |
19 | textContent: null, | 32 | /** |
20 | href: null, | 33 | The text displayed by the link. |
21 | hreflang: null, | 34 | @type string |
22 | media: null, | 35 | @default null |
23 | rel: null, | 36 | */ |
24 | target: null, | 37 | textContent: null, |
25 | type: null | 38 | |
39 | /** | ||
40 | The link target URL. | ||
41 | @type string | ||
42 | @default null | ||
43 | */ | ||
44 | href: null, | ||
45 | |||
46 | /** | ||
47 | The language of the linked resource. | ||
48 | @type string | ||
49 | @default null | ||
50 | */ | ||
51 | hreflang: null, | ||
52 | |||
53 | /** | ||
54 | The media type for which the target document was designed. | ||
55 | @type string | ||
56 | @default null | ||
57 | */ | ||
58 | media: null, | ||
59 | |||
60 | /** | ||
61 | Controls what kinds of links the elements create. | ||
62 | @type string | ||
63 | @default null | ||
64 | */ | ||
65 | rel: null, | ||
66 | |||
67 | /** | ||
68 | The target window the link will open in. | ||
69 | @type string | ||
70 | @default null | ||
71 | */ | ||
72 | target: null, | ||
73 | |||
74 | /** | ||
75 | The MIME type of the linked resource. | ||
76 | @type string | ||
77 | @default null | ||
78 | */ | ||
79 | type: null | ||
26 | }); | 80 | }); |
diff --git a/node_modules/montage/ui/application.js b/node_modules/montage/ui/application.js index 7cb4bd97..bbce6835 100755 --- a/node_modules/montage/ui/application.js +++ b/node_modules/montage/ui/application.js | |||
@@ -169,7 +169,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta | |||
169 | _zIndex: {value: null}, | 169 | _zIndex: {value: null}, |
170 | 170 | ||
171 | _isSystemPopup: {value: function(type) { | 171 | _isSystemPopup: {value: function(type) { |
172 | return (type === 'alert' || type === 'confirm' || type === 'loading'); | 172 | return (type === 'alert' || type === 'confirm' || type === 'notify'); |
173 | }}, | 173 | }}, |
174 | 174 | ||
175 | _createPopupSlot: {value: function(zIndex) { | 175 | _createPopupSlot: {value: function(zIndex) { |
@@ -201,7 +201,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta | |||
201 | case "confirm": | 201 | case "confirm": |
202 | zIndex = 9003; |