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/image.reel/image.js | |
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/image.reel/image.js')
-rwxr-xr-x | node_modules/montage/ui/image.reel/image.js | 54 |
1 files changed, 12 insertions, 42 deletions
diff --git a/node_modules/montage/ui/image.reel/image.js b/node_modules/montage/ui/image.reel/image.js index 149f650b..58b8efba 100755 --- a/node_modules/montage/ui/image.reel/image.js +++ b/node_modules/montage/ui/image.reel/image.js | |||
@@ -3,52 +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/image.reel" | ||
9 | @requires montage/ui/component | ||
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 | NativeImage = require("ui/native/image.reel").Image; |
15 | 10 | ||
16 | /** | 11 | /** |
17 | * Wraps the a <img> element with binding support for its standard attributes. | 12 | * Input Text |
18 | @class module:"montage/ui/image.reel".Image | ||
19 | @extends module:montage/native-control.NativeControl | ||
20 | */ | 13 | */ |
21 | var Image = exports.Image = Montage.create(NativeControl, { | 14 | exports.Image = Montage.create(NativeImage, { |
22 | |||
23 | }); | ||
24 | |||
25 | Image.addAttributes(/** @lends module:"montage/ui/image.reel".Image */{ | ||
26 | |||
27 | /** | ||
28 | A text description to display in place of the image. | ||
29 | @type {string} | ||
30 | @default null | ||
31 | */ | ||
32 | alt: null, | ||
33 | 15 | ||
34 | /** | 16 | didSetElement: { |
35 | The height of the image in CSS pixels. | 17 | value: function() { |
36 | @type {number} | 18 | // Call super method |
37 | @default null | 19 | NativeImage.didSetElement.call(this); |
38 | */ | 20 | this['class'] = (this['class'] || '') + ' montage-image'; |
39 | height: null, | 21 | } |
22 | } | ||
40 | 23 | ||
41 | /** | 24 | }); \ No newline at end of file |
42 | The URL where the image is located. | ||
43 | @type {string} | ||
44 | @default null | ||
45 | */ | ||
46 | src: null, | ||
47 | |||
48 | /** | ||
49 | The width of the image in CSS pixels. | ||
50 | @type {number} | ||
51 | @default null | ||
52 | */ | ||
53 | width: null | ||
54 | }); | ||