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/image.reel/image.js | |
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/image.reel/image.js')
-rwxr-xr-x | node_modules/montage/ui/image.reel/image.js | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/node_modules/montage/ui/image.reel/image.js b/node_modules/montage/ui/image.reel/image.js index 5deebbf6..149f650b 100755 --- a/node_modules/montage/ui/image.reel/image.js +++ b/node_modules/montage/ui/image.reel/image.js | |||
@@ -3,20 +3,52 @@ | |||
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/image.reel" | ||
9 | @requires montage/ui/component | ||
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 | 15 | ||
10 | /** | 16 | /** |
11 | * The <img> native control with binding support for the standard attributes | 17 | * Wraps the a <img> element with binding support for its standard attributes. |
18 | @class module:"montage/ui/image.reel".Image | ||
19 | @extends module:montage/native-control.NativeControl | ||
12 | */ | 20 | */ |
13 | var Image = exports.Image = Montage.create(NativeControl, { | 21 | var Image = exports.Image = Montage.create(NativeControl, { |
14 | 22 | ||
15 | }); | 23 | }); |
16 | 24 | ||
17 | Image.addAttributes({ | 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 | */ | ||
18 | alt: null, | 32 | alt: null, |
33 | |||
34 | /** | ||
35 | The height of the image in CSS pixels. | ||
36 | @type {number} | ||
37 | @default null | ||
38 | */ | ||
19 | height: null, | 39 | height: null, |
40 | |||
41 | /** | ||
42 | The URL where the image is located. | ||
43 | @type {string} | ||
44 | @default null | ||
45 | */ | ||
20 | src: null, | 46 | src: null, |
47 | |||
48 | /** | ||
49 | The width of the image in CSS pixels. | ||
50 | @type {number} | ||
51 | @default null | ||
52 | */ | ||
21 | width: null | 53 | width: null |
22 | }); | 54 | }); |