diff options
| author | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
| commit | 46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch) | |
| tree | 38d1c8666098a10078834c1eaac3d455135bee12 /node_modules/montage/ui/list.reel/list.html | |
| parent | 7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/list.reel/list.html')
| -rwxr-xr-x | node_modules/montage/ui/list.reel/list.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node_modules/montage/ui/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html index 98629f04..2e52b11d 100755 --- a/node_modules/montage/ui/list.reel/list.html +++ b/node_modules/montage/ui/list.reel/list.html | |||
| @@ -40,12 +40,12 @@ | |||
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | }, | 42 | }, |
| 43 | "scrollview1": { | 43 | "scroller1": { |
| 44 | "module": "montage/ui/scrollview.reel", | 44 | "module": "montage/ui/scroller.reel", |
| 45 | "name": "Scrollview", | 45 | "name": "Scroller", |
| 46 | "properties": { | 46 | "properties": { |
| 47 | "element": { | 47 | "element": { |
| 48 | "#": "scrollView" | 48 | "#": "scroller" |
| 49 | } | 49 | } |
| 50 | }, | 50 | }, |
| 51 | "bindings": { | 51 | "bindings": { |
| @@ -74,7 +74,7 @@ | |||
| 74 | </head> | 74 | </head> |
| 75 | <body> | 75 | <body> |
| 76 | <div id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> | 76 | <div id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> |
| 77 | <div id="scrollView" class="montage-list-scrollView"> | 77 | <div id="scroller" class="montage-list-scroller"> |
| 78 | <div data-montage-id="repetition"></div> | 78 | <div data-montage-id="repetition"></div> |
| 79 | </div> | 79 | </div> |
| 80 | </div> | 80 | </div> |