diff options
| author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
| commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
| tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/panels/PanelContainer.reel | |
| parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/PanelContainer.reel')
| -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 0f6cf263..900930d9 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 | } |
| @@ -77,8 +70,7 @@ | |||
| 77 | }, | 70 | }, |
| 78 | 71 | ||
| 79 | "owner": { | 72 | "owner": { |
| 80 | "module": "js/panels/PanelContainer.reel", | 73 | "prototype": "js/panels/PanelContainer.reel", |
| 81 | "name": "PanelContainer", | ||
| 82 | "properties": { | 74 | "properties": { |
| 83 | "element": {"#": "panelContainer"}, | 75 | "element": {"#": "panelContainer"}, |
| 84 | "panelData": {"@": "panelData" }, | 76 | "panelData": {"@": "panelData" }, |