diff options
author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /node_modules/montage/ui/progress.reel/progress.js | |
parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/progress.reel/progress.js')
-rwxr-xr-x | node_modules/montage/ui/progress.reel/progress.js | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/node_modules/montage/ui/progress.reel/progress.js b/node_modules/montage/ui/progress.reel/progress.js index 973ec5b7..06704f9f 100755 --- a/node_modules/montage/ui/progress.reel/progress.js +++ b/node_modules/montage/ui/progress.reel/progress.js | |||
@@ -3,17 +3,47 @@ | |||
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/progress.reel" | ||
9 | @requires montage/ui/commponent | ||
10 | @requires montage/ui/native-control | ||
11 | */ | ||
12 | |||
6 | var Montage = require("montage").Montage, | 13 | var Montage = require("montage").Montage, |
7 | Component = require("ui/component").Component, | 14 | Component = require("ui/component").Component, |
8 | NativeControl = require("ui/native-control").NativeControl; | 15 | NativeControl = require("ui/native-control").NativeControl; |
9 | 16 | ||
17 | /** | ||
18 | The Progress component wraps a native <code><progress></code> element and exposes its standard attributes as bindable properties. | ||
19 | @class module:"montage/ui/progress.reel".Progress | ||
20 | @extends module:montage/native-control.NativeControl | ||
10 | 21 | ||
22 | */ | ||
11 | var Progress = exports.Progress = Montage.create(NativeControl, { | 23 | var Progress = exports.Progress = Montage.create(NativeControl, { |
12 | 24 | ||
13 | }); | 25 | }); |
14 | 26 | ||
15 | Progress.addAttributes({ | 27 | Progress.addAttributes( /** @lends module:"montage/ui/progress.reel".Progress# */{ |
28 | |||
29 | /** | ||
30 | The value of the id attribute of the form with which to associate the component's element. | ||
31 | @type string} | ||
32 | @default null | ||
33 | */ | ||
16 | form: null, | 34 | form: null, |
35 | |||
36 | /** | ||
37 | The maximum value displayed but the progress control. | ||
38 | @type {number} | ||
39 | @default null | ||
40 | */ | ||
17 | max: {dataType: 'number'}, | 41 | max: {dataType: 'number'}, |
42 | |||
43 | /** | ||
44 | The current value displayed but the progress control. | ||
45 | @type {number} | ||
46 | @default null | ||
47 | */ | ||
18 | value: {dataType: 'number'} | 48 | value: {dataType: 'number'} |
19 | }); \ No newline at end of file | 49 | }); \ No newline at end of file |