diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui')
107 files changed, 3442 insertions, 2941 deletions
diff --git a/node_modules/montage/ui/anchor.reel/anchor.js b/node_modules/montage/ui/anchor.reel/anchor.js index 2c12684b..62eefede 100644 --- a/node_modules/montage/ui/anchor.reel/anchor.js +++ b/node_modules/montage/ui/anchor.reel/anchor.js | |||
@@ -3,78 +3,22 @@ | |||
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 | 6 | /*global require,exports */ | |
7 | /** | ||
8 | @module "montage/ui/anchor.reel" | ||
9 | @requires montage/core/core | ||
10 | @requires montage/ui/native-control | ||
11 | */ | ||
12 | var Montage = require("montage").Montage, | 7 | var Montage = require("montage").Montage, |
13 | Component = require("ui/component").Component, | 8 | Component = require("ui/component").Component, |
14 | NativeControl = require("ui/native-control").NativeControl; | 9 | NativeAnchor = require("ui/native/anchor.reel").Anchor; |
15 | /** | ||
16 | The Anchor component wraps a native <code><a></code> element and exposes its standard attributes as bindable properties. | ||
17 | @class module:"montage/ui/anchor.reel".Anchor | ||
18 | @extends module:montage/native-control.NativeControl | ||
19 | |||
20 | */ | ||
21 | var Anchor = exports.Anchor = Montage.create(NativeControl, { | ||
22 | |||
23 | // HTMLAnchorElement methods | ||
24 | |||
25 | blur: { value: function() { this._element.blur(); } }, | ||