diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /node_modules/montage/ui/list.reel/list.html | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'node_modules/montage/ui/list.reel/list.html')
-rwxr-xr-x | node_modules/montage/ui/list.reel/list.html | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/node_modules/montage/ui/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html index b2bf2141..d3b27e0a 100755 --- a/node_modules/montage/ui/list.reel/list.html +++ b/node_modules/montage/ui/list.reel/list.html | |||
@@ -10,8 +10,7 @@ | |||
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 | "prototype": "montage/ui/repetition.reel", |
14 | "name": "Repetition", | ||
15 | "properties": { | 14 | "properties": { |
16 | "element": { | 15 | "element": { |
17 | "#": "repetition" | 16 | "#": "repetition" |
@@ -25,8 +24,7 @@ | |||
25 | } | 24 | } |
26 | }, | 25 | }, |
27 | "scroller1": { | 26 | "scroller1": { |
28 | "module": "montage/ui/scroller.reel", | 27 | "prototype": "montage/ui/scroller.reel", |
29 | "name": "Scroller", | ||
30 | "properties": { | 28 | "properties": { |
31 | "element": { | 29 | "element": { |
32 | "#": "scroller" | 30 | "#": "scroller" |
@@ -37,8 +35,7 @@ | |||
37 | } | 35 | } |
38 | }, | 36 | }, |
39 | "owner": { | 37 | "owner": { |
40 | "module": "montage/ui/list.reel", | 38 | "prototype": "montage/ui/list.reel", |
41 | "name": "List", | ||
42 | "properties": { | 39 | "properties": { |
43 | "element": { | 40 | "element": { |
44 | "#": "EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9" | 41 | "#": "EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9" |
@@ -53,8 +50,8 @@ | |||
53 | 50 | ||
54 | </head> | 51 | </head> |
55 | <body> | 52 | <body> |
56 | <div id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> | 53 | <div data-montage-id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> |
57 | <div id="scroller" class="montage-list-scroller"> | 54 | <div data-montage-id="scroller" class="montage-list-scroller"> |
58 | <div data-montage-id="repetition"></div> | 55 | <div data-montage-id="repetition"></div> |
59 | </div> | 56 | </div> |
60 | </div> | 57 | </div> |