aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/PanelContainer.reel
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/PanelContainer.reel')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html3
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>