diff options
| author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
| commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
| tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/loading-panel.reel | |
| parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
| download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz | |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/loading-panel.reel')
| -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> |