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/list.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/list.reel')
| -rwxr-xr-x | node_modules/montage/ui/list.reel/list.html | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/node_modules/montage/ui/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html index 2e52b11d..b2bf2141 100755 --- a/node_modules/montage/ui/list.reel/list.html +++ b/node_modules/montage/ui/list.reel/list.html | |||
| @@ -7,8 +7,8 @@ | |||
| 7 | <html> | 7 | <html> |
| 8 | <head> | 8 | <head> |
| 9 | <title></title> | 9 | <title></title> |
| 10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization">{ |
| 11 | { | 11 | |
| 12 | "repetition1": { | 12 | "repetition1": { |
| 13 | "module": "montage/ui/repetition.reel", | 13 | "module": "montage/ui/repetition.reel", |
| 14 | "name": "Repetition", | 14 | "name": "Repetition", |
| @@ -18,26 +18,10 @@ | |||
| 18 | } | 18 | } |
| 19 | }, | 19 | }, |
| 20 | "bindings": { | 20 | "bindings": { |
| 21 | "content": { | 21 | "content": {"<-": "@owner.originalContent"}, |
| 22 | "boundObject": {"@": "owner"}, | 22 | "objects": {"<-": "@owner.objects"}, |
| 23 | "boundObjectPropertyPath": "originalContent", | 23 | "contentController": {"<-": "@owner.contentController"}, |
| 24 | "oneway": true | 24 | "isSelectionEnabled": {"<-": "@owner.isSelectionEnabled"} |
| 25 | }, | ||
| 26 | "objects": { | ||
| 27 | "boundObject": {"@": "owner"}, | ||
| 28 | "boundObjectPropertyPath": "objects", | ||
| 29 | "oneway": true | ||
| 30 | }, | ||
| 31 | "contentController": { | ||
| 32 | "boundObject": {"@": "owner"}, | ||
| 33 | "boundObjectPropertyPath": "contentController", | ||
| 34 | "oneway": true | ||
| 35 | }, | ||
| 36 | "isSelectionEnabled": { | ||
| 37 | "boundObject": {"@": "owner"}, | ||
| 38 | "boundObjectPropertyPath": "isSelectionEnabled", | ||
| 39 | "oneway": true | ||
| 40 | } | ||
| 41 | } | 25 | } |
| 42 | }, | 26 | }, |
| 43 | "scroller1": { | 27 | "scroller1": { |
| @@ -49,11 +33,7 @@ | |||
| 49 | } | 33 | } |
| 50 | }, | 34 | }, |
| 51 | "bindings": { | 35 | "bindings": { |
| 52 | "axis": { | 36 | "axis": {"<-": "@owner.axis"} |
| 53 | "boundObject": {"@": "owner"}, | ||
| 54 | "boundObjectPropertyPath": "axis", | ||
| 55 | "oneway": true | ||
| 56 | } | ||
| 57 | } | 37 | } |
| 58 | }, | 38 | }, |
| 59 | "owner": { | 39 | "owner": { |
| @@ -68,8 +48,8 @@ | |||
| 68 | } | 48 | } |
| 69 | } | 49 | } |
| 70 | } | 50 | } |
| 71 | } | 51 | |
| 72 | </script> | 52 | }</script> |
| 73 | 53 | ||
| 74 | </head> | 54 | </head> |
| 75 | <body> | 55 | <body> |