diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/bluemoon/progress.reel | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/bluemoon/progress.reel')
-rw-r--r-- | node_modules/montage/ui/bluemoon/progress.reel/progress.html | 1 | ||||
-rw-r--r-- | node_modules/montage/ui/bluemoon/progress.reel/progress.js | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.html b/node_modules/montage/ui/bluemoon/progress.reel/progress.html index 53ff4ab3..a3835fe6 100644 --- a/node_modules/montage/ui/bluemoon/progress.reel/progress.html +++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.html | |||
@@ -11,7 +11,6 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "prototype": "montage/ui/bluemoon/progress.reel", | ||
15 | "properties": { | 14 | "properties": { |
16 | "element": {"#": "progress"}, | 15 | "element": {"#": "progress"}, |
17 | "_barElement": {"#": "bar"} | 16 | "_barElement": {"#": "bar"} |
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.js b/node_modules/montage/ui/bluemoon/progress.reel/progress.js index 20c60d94..d7661445 100644 --- a/node_modules/montage/ui/bluemoon/progress.reel/progress.js +++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.js | |||
@@ -20,7 +20,7 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo | |||
20 | @private | 20 | @private |
21 | */ | 21 | */ |
22 | _barElement: { | 22 | _barElement: { |
23 | enumerable: false, | 23 | serializable: true, |
24 | value: null | 24 | value: null |
25 | }, | 25 | }, |
26 | /** | 26 | /** |
@@ -51,7 +51,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo | |||
51 | } | 51 | } |
52 | this.needsDraw = true; | 52 | this.needsDraw = true; |
53 | } | 53 | } |
54 | } | 54 | }, |
55 | serializable: true | ||
55 | }, | 56 | }, |
56 | /** | 57 | /** |
57 | Description TODO | 58 | Description TODO |
@@ -78,7 +79,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo | |||
78 | } | 79 | } |
79 | this.needsDraw = true; | 80 | this.needsDraw = true; |
80 | } | 81 | } |
81 | } | 82 | }, |
83 | serializable: true | ||
82 | }, | 84 | }, |
83 | /** | 85 | /** |
84 | Description TODO | 86 | Description TODO |
@@ -111,7 +113,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo | |||
111 | this._scrolling = value; | 113 | this._scrolling = value; |
112 | this.needsDraw = true; | 114 | this.needsDraw = true; |
113 | } | 115 | } |
114 | } | 116 | }, |
117 | serializable: true | ||
115 | }, | 118 | }, |
116 | /** | 119 | /** |
117 | Description TODO | 120 | Description TODO |