diff options
author | Jon Reid | 2012-03-09 16:47:26 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-09 16:47:26 -0800 |
commit | be59c44f9232104ded1a9c4cd888d70021eba33e (patch) | |
tree | b94c8432759362e035f15c0936c575a2861b6ad8 /node_modules/montage/ui/loading-panel.reel/loading-panel.html | |
parent | 54b31ecbd4c9877183850542227c61946a62aa4f (diff) | |
parent | a28cb88194f45325e42dd8c774469424712dd6f4 (diff) | |
download | ninja-be59c44f9232104ded1a9c4cd888d70021eba33e.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
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 | ||