diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/PanelContainer.reel/PanelContainer.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
| -rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index d3673105..ccefd3ae 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,12 +63,10 @@ | |||
| 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" }, |
| 78 | "panelController" : {"@": "PanelController"}, | ||
| 79 | "panel_0": {"@": "panel_0"}, | 70 | "panel_0": {"@": "panel_0"}, |
| 80 | "panel_1": {"@": "panel_1"}, | 71 | "panel_1": {"@": "panel_1"}, |
| 81 | "panel_2": {"@": "panel_2"}, | 72 | "panel_2": {"@": "panel_2"}, |
| @@ -104,7 +95,7 @@ | |||
| 104 | 95 | ||
| 105 | </head> | 96 | </head> |
| 106 | <body> | 97 | <body> |
| 107 | <section id="panelContainer"> | 98 | <section data-montage-id="panelContainer"> |
| 108 | <article id="panels" class="panels"> | 99 | <article id="panels" class="panels"> |
| 109 | <article data-montage-id="panel_0"></article> | 100 | <article data-montage-id="panel_0"></article> |
| 110 | <article data-montage-id="panel_1"></article> | 101 | <article data-montage-id="panel_1"></article> |