diff options
| author | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
| commit | 32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch) | |
| tree | fbf05f2dfc91e57ab9598046ff16798ea0ae1966 /node_modules/montage/ui/loading-panel.reel/loading-panel.html | |
| parent | 60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff) | |
| parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
| download | ninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
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 | 32 |
1 files changed, 8 insertions, 24 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 ff1677ea..915d18cc 100755 --- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html +++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | 11 | ||
| 12 | <link rel="stylesheet" href="loading-panel.css"> | 12 | <link rel="stylesheet" href="loading-panel.css"> |
| 13 | 13 | ||
| 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 | "module": "montage/ui/loading-panel.reel", |
| 18 | "name": "LoadingPanel", | 18 | "name": "LoadingPanel", |
| @@ -29,16 +29,8 @@ | |||
| 29 | "loading": true | 29 | "loading": true |
| 30 | }, | 30 | }, |
| 31 | "bindings": { | 31 | "bindings": { |
| 32 | "value": { | 32 | "value": {"<-": "@owner.initializedModuleCount"}, |
| 33 | "boundObject": {"@": "owner"}, | 33 | "max": {"<-": "@owner.requiredModuleCount"} |
| 34 | "boundObjectPropertyPath": "initializedModuleCount", | ||
| 35 | "oneway": true | ||
| 36 | }, | ||
| 37 | "max": { | ||
| 38 | "boundObject": {"@": "owner"}, | ||
| 39 | "boundObjectPropertyPath": "requiredModuleCount", | ||
| 40 | "oneway": true | ||
| 41 | } | ||
| 42 | } | 34 | } |
| 43 | }, | 35 | }, |
| 44 | 36 | ||
| @@ -49,11 +41,7 @@ | |||
| 49 | "element": {"#": "loadedCount"} | 41 | "element": {"#": "loadedCount"} |
| 50 | }, | 42 | }, |
| 51 | "bindings": { | 43 | "bindings": { |
| 52 | "value": { | 44 | "value": {"<-": "@owner.initializedModuleCount"} |
| 53 | "boundObject": {"@": "owner"}, | ||
| 54 | "boundObjectPropertyPath": "initializedModuleCount", | ||
| 55 | "oneway": true | ||
| 56 | } | ||
| 57 | } | 45 | } |
| 58 | }, | 46 | }, |
| 59 | 47 | ||
| @@ -64,16 +52,12 @@ | |||
| 64 | "element": {"#": "requiredCount"} | 52 | "element": {"#": "requiredCount"} |
| 65 | }, | 53 | }, |
| 66 | "bindings": { | 54 | "bindings": { |
| 67 | "value": { | 55 | "value": {"<-": "@owner.requiredModuleCount"} |
| 68 | "boundObject": {"@": "owner"}, | ||
| 69 | "boundObjectPropertyPath": "requiredModuleCount", | ||
| 70 | "oneway": true | ||
| 71 | } | ||
| 72 | } | 56 | } |
| 73 | } | 57 | } |
| 74 | 58 | ||
| 75 | } | 59 | |
| 76 | </script> | 60 | }</script> |
| 77 | 61 | ||
| 78 | </head> | 62 | </head> |
| 79 | <body> | 63 | <body> |