diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/PanelContainer.reel/PanelContainer.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.html')
| -rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index e5cbbe32..ccefd3ae 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
| @@ -67,7 +67,6 @@ | |||
| 67 | "properties": { | 67 | "properties": { |
| 68 | "element": {"#": "panelContainer"}, | 68 | "element": {"#": "panelContainer"}, |
| 69 | "panelData": {"@": "panelData" }, | 69 | "panelData": {"@": "panelData" }, |
| 70 | "panelController" : {"@": "PanelController"}, | ||
| 71 | "panel_0": {"@": "panel_0"}, | 70 | "panel_0": {"@": "panel_0"}, |
| 72 | "panel_1": {"@": "panel_1"}, | 71 | "panel_1": {"@": "panel_1"}, |
| 73 | "panel_2": {"@": "panel_2"}, | 72 | "panel_2": {"@": "panel_2"}, |
| @@ -96,7 +95,7 @@ | |||
| 96 | 95 | ||
| 97 | </head> | 96 | </head> |
| 98 | <body> | 97 | <body> |
| 99 | <section id="panelContainer"> | 98 | <section data-montage-id="panelContainer"> |
| 100 | <article id="panels" class="panels"> | 99 | <article id="panels" class="panels"> |
| 101 | <article data-montage-id="panel_0"></article> | 100 | <article data-montage-id="panel_0"></article> |
| 102 | <article data-montage-id="panel_1"></article> | 101 | <article data-montage-id="panel_1"></article> |