diff options
author | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
commit | 46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch) | |
tree | 38d1c8666098a10078834c1eaac3d455135bee12 /node_modules/montage/ui/loading-panel.reel/loading-panel.html | |
parent | 7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/loading-panel.reel/loading-panel.html')
-rwxr-xr-x | node_modules/montage/ui/loading-panel.reel/loading-panel.html | 6 |
1 files changed, 4 insertions, 2 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 27825a09..ff1677ea 100755 --- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html +++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html | |||
@@ -34,7 +34,7 @@ | |||
34 | "boundObjectPropertyPath": "initializedModuleCount", | 34 | "boundObjectPropertyPath": "initializedModuleCount", |
35 | "oneway": true | 35 | "oneway": true |
36 | }, | 36 | }, |
37 | "maximumValue": { | 37 | "max": { |
38 | "boundObject": {"@": "owner"}, | 38 | "boundObject": {"@": "owner"}, |
39 | "boundObjectPropertyPath": "requiredModuleCount", | 39 | "boundObjectPropertyPath": "requiredModuleCount", |
40 | "oneway": true | 40 | "oneway": true |
@@ -81,7 +81,9 @@ | |||
81 | <div id="loadingPanel" class="montage-loading-panel"> | 81 | <div id="loadingPanel" class="montage-loading-panel"> |
82 | <div id="loadingIndicator" class="loadingIndicator"></div> | 82 | <div id="loadingIndicator" class="loadingIndicator"></div> |
83 | <div id="loadingCount" class="loadingCount"> | 83 | <div id="loadingCount" class="loadingCount"> |
84 | <span id="loadedCount" class="loadedCount">0</span><span class="divider">/</span><span id="requiredCount" class="requiredCount">0</span> | 84 | <span id="loadedCount" class="loadedCount">0</span> |
85 | <span class="divider">/</span> | ||
86 | <span id="requiredCount" class="requiredCount">0</span> | ||
85 | </div> | 87 | </div> |
86 | </div> | 88 | </div> |
87 | 89 | ||