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/tabs.reel | |
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/tabs.reel')
-rwxr-xr-x | node_modules/montage/ui/tabs.reel/tabs.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/node_modules/montage/ui/tabs.reel/tabs.html b/node_modules/montage/ui/tabs.reel/tabs.html index e3e655b2..5ceedf13 100755 --- a/node_modules/montage/ui/tabs.reel/tabs.html +++ b/node_modules/montage/ui/tabs.reel/tabs.html | |||
@@ -23,8 +23,7 @@ | |||
23 | }, | 23 | }, |
24 | 24 | ||
25 | "repetition1": { | 25 | "repetition1": { |
26 | "module": "montage/ui/repetition.reel", | 26 | "prototype": "montage/ui/repetition.reel", |
27 | "name": "Repetition", | ||
28 | "properties": { | 27 | "properties": { |
29 | "element": { | 28 | "element": { |
30 | "#": "tab-list" | 29 | "#": "tab-list" |
@@ -35,8 +34,7 @@ | |||
35 | }, | 34 | }, |
36 | 35 | ||
37 | "owner": { | 36 | "owner": { |
38 | "module": "montage/ui/tabs.reel", | 37 | "prototype": "montage/ui/tabs.reel", |
39 | "name": "Tabs", | ||
40 | "properties": { | 38 | "properties": { |
41 | "element": { | 39 | "element": { |
42 | "#": "tabs-nav" | 40 | "#": "tabs-nav" |
@@ -61,9 +59,9 @@ | |||
61 | </head> | 59 | </head> |
62 | <body> | 60 | <body> |
63 | 61 | ||
64 | <div id='tabs-nav' class='montage-tabs montage-container'> | 62 | <div data-montage-id='tabs-nav' class='montage-tabs montage-container'> |
65 | <div id="montage-tabs-indicator" class="montage-tabs-indicator" style="display: none;"></div> | 63 | <div data-montage-id="montage-tabs-indicator" class="montage-tabs-indicator" style="display: none;"></div> |
66 | <ul id="tab-list" class='montage-tabs-list montage-clearfix'> | 64 | <ul data-montage-id="tab-list" class='montage-tabs-list montage-clearfix'> |
67 | <li></li> | 65 | <li></li> |
68 | </ul> | 66 | </ul> |
69 | </div> | 67 | </div> |