diff options
author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /node_modules/montage/ui/loading-panel.reel | |
parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'node_modules/montage/ui/loading-panel.reel')
-rwxr-xr-x | node_modules/montage/ui/loading-panel.reel/loading-panel.html | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html index 915d18cc..d1f8078e 100755 --- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html +++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html | |||
@@ -14,16 +14,14 @@ | |||
14 | <script type="text/montage-serialization">{ | 14 | <script type="text/montage-serialization">{ |
15 | 15 | ||
16 | "owner": { | 16 | "owner": { |
17 | "module": "montage/ui/loading-panel.reel", | 17 | "prototype": "montage/ui/loading-panel.reel", |
18 | "name": "LoadingPanel", | ||
19 | "properties": { | 18 | "properties": { |
20 | "element": {"#": "loadingPanel"} | 19 | "element": {"#": "loadingPanel"} |
21 | } | 20 | } |
22 | }, | 21 | }, |
23 | 22 | ||
24 | "loadingIndicator": { | 23 | "loadingIndicator": { |
25 | "module": "montage/ui/bluemoon/progress.reel", | 24 | "prototype": "montage/ui/bluemoon/progress.reel", |
26 | "name": "Progress", | ||
27 | "properties": { | 25 | "properties": { |
28 | "element": {"#": "loadingIndicator"}, | 26 | "element": {"#": "loadingIndicator"}, |
29 | "loading": true | 27 | "loading": true |
@@ -35,8 +33,7 @@ | |||
35 | }, | 33 | }, |
36 | 34 | ||
37 | "loadedCount": { | 35 | "loadedCount": { |
38 | "module": "montage/ui/dynamic-text.reel", | 36 | "prototype": "montage/ui/dynamic-text.reel", |
39 | "name": "DynamicText", | ||
40 | "properties": { | 37 | "properties": { |
41 | "element": {"#": "loadedCount"} | 38 | "element": {"#": "loadedCount"} |
42 | }, | 39 | }, |
@@ -46,8 +43,7 @@ | |||
46 | }, | 43 | }, |
47 | 44 | ||
48 | "requiredCount": { | 45 | "requiredCount": { |
49 | "module": "montage/ui/dynamic-text.reel", | 46 | "prototype": "montage/ui/dynamic-text.reel", |
50 | "name": "DynamicText", | ||
51 | "properties": { | 47 | "properties": { |
52 | "element": {"#": "requiredCount"} | 48 | "element": {"#": "requiredCount"} |
53 | }, | 49 | }, |
@@ -56,18 +52,18 @@ | |||
56 | } | 52 | } |
57 | } | 53 | } |
58 | 54 | ||
59 | 55 | ||
60 | }</script> | 56 | }</script> |
61 | 57 | ||
62 | </head> | 58 | </head> |
63 | <body> | 59 | <body> |
64 | 60 | ||
65 | <div id="loadingPanel" class="montage-loading-panel"> | 61 | <div data-montage-id="loadingPanel" class="montage-loading-panel"> |
66 | <div id="loadingIndicator" class="loadingIndicator"></div> | 62 | <div data-montage-id="loadingIndicator" class="loadingIndicator"></div> |
67 | <div id="loadingCount" class="loadingCount"> | 63 | <div data-montage-id="loadingCount" class="loadingCount"> |
68 | <span id="loadedCount" class="loadedCount">0</span> | 64 | <span data-montage-id="loadedCount" class="loadedCount">0</span> |
69 | <span class="divider">/</span> | 65 | <span class="divider">/</span> |
70 | <span id="requiredCount" class="requiredCount">0</span> | 66 | <span data-montage-id="requiredCount" class="requiredCount">0</span> |
71 | </div> | 67 | </div> |
72 | </div> | 68 | </div> |
73 | 69 | ||