diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/list.reel/list.html | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/list.reel/list.html')
| -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> |