diff options
author | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
commit | 7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch) | |
tree | 6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/panels/PanelContainer.reel/PanelContainer.html | |
parent | d988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
-rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index d3673105..e5cbbe32 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
@@ -10,53 +10,46 @@ | |||
10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization"> |
11 | { | 11 | { |
12 | "panelData": { | 12 | "panelData": { |
13 | "module": "js/data/panels-data", | 13 | "prototype": "js/data/panels-data" |
14 | "name": "PanelsData" | ||
15 | }, | 14 | }, |
16 | 15 | ||
17 | "panel_0": { | 16 | "panel_0": { |
18 | "module": "js/panels/Panel.reel", | 17 | "prototype": "js/panels/Panel.reel", |
19 | "name": "Panel", | ||
20 | "properties": { | 18 | "properties": { |
21 | "element": {"#": "panel_0"} | 19 | "element": {"#": "panel_0"} |
22 | } | 20 | } |
23 | }, | 21 | }, |
24 | 22 | ||
25 | "panel_1": { | 23 | "panel_1": { |
26 | "module": "js/panels/Panel.reel", | 24 | "prototype": "js/panels/Panel.reel", |
27 | "name": "Panel", | ||
28 | "properties": { | 25 | "properties": { |
29 | "element": {"#": "panel_1"} | 26 | "element": {"#": "panel_1"} |
30 | } | 27 | } |
31 | }, | 28 | }, |
32 | 29 | ||
33 | "panel_2": { | 30 | "panel_2": { |
34 | "module": "js/panels/Panel.reel", | 31 | "prototype": "js/panels/Panel.reel", |
35 | "name": "Panel", | ||
36 | "properties": { | 32 | "properties": { |
37 | "element": {"#": "panel_2"} | 33 | "element": {"#": "panel_2"} |
38 | } | 34 | } |
39 | }, | 35 | }, |
40 | 36 | ||
41 | "panel_3": { | 37 | "panel_3": { |
42 | "module": "js/panels/Panel.reel", | 38 | "prototype": "js/panels/Panel.reel", |
43 | "name": "Panel", | ||
44 | "properties": { | 39 | "properties": { |
45 | "element": {"#": "panel_3"} | 40 | "element": {"#": "panel_3"} |
46 | } | 41 | } |
47 | }, | 42 | }, |
48 | 43 | ||
49 | "panel_4": { | 44 | "panel_4": { |
50 | "module": "js/panels/Panel.reel", | 45 | "prototype": "js/panels/Panel.reel", |
51 | "name": "Panel", | ||
52 | "properties": { | 46 | "properties": { |
53 | "element": {"#": "panel_4"} | 47 | "element": {"#": "panel_4"} |
54 | } | 48 | } |
55 | }, | 49 | }, |
56 | 50 | ||
57 | "panel_5": { | 51 | "panel_5": { |
58 | "module": "js/panels/Panel.reel", | 52 | "prototype": "js/panels/Panel.reel", |
59 | "name": "Panel", | ||
60 | "properties": { | 53 | "properties": { |
61 | "element": {"#": "panel_5"} | 54 | "element": {"#": "panel_5"} |
62 | } | 55 | } |
@@ -70,8 +63,7 @@ | |||
70 | }, | 63 | }, |
71 | 64 | ||
72 | "owner": { | 65 | "owner": { |
73 | "module": "js/panels/PanelContainer.reel", | 66 | "prototype": "js/panels/PanelContainer.reel", |
74 | "name": "PanelContainer", | ||
75 | "properties": { | 67 | "properties": { |
76 | "element": {"#": "panelContainer"}, | 68 | "element": {"#": "panelContainer"}, |
77 | "panelData": {"@": "panelData" }, | 69 | "panelData": {"@": "panelData" }, |