diff options
author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /node_modules/montage/ui | |
parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'node_modules/montage/ui')
104 files changed, 7601 insertions, 5470 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 | }, |