aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorEric Guzman2012-02-29 16:13:19 -0800
committerEric Guzman2012-02-29 16:13:19 -0800
commit53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch)
tree44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/ninja.reel
parentb2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff)
parentb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff)
downloadninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html30
1 files changed, 18 insertions, 12 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1393b4b9..a20a6090 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -22,9 +22,9 @@
22 "name": "Preloader" 22 "name": "Preloader"
23 }, 23 },
24 24
25 "settings1": { 25 "localStorage": {
26 "module": "js/data/settings", 26 "module": "js/controllers/local-storage-controller",
27 "name": "Settings" 27 "name": "LocalStorage"
28 }, 28 },
29 29
30 "toolsData1": { 30 "toolsData1": {
@@ -181,7 +181,13 @@
181 "name": "Breadcrumb", 181 "name": "Breadcrumb",
182 "properties":{ 182 "properties":{
183 "element":{"#" : "breadCrumbComponent"} 183 "element":{"#" : "breadCrumbComponent"}
184 184 },
185 "bindings" : {
186 "container": {
187 "boundObject": {"@": "owner"},
188 "boundObjectPropertyPath": "currentSelectedContainer",
189 "oneway": false
190 }
185 } 191 }
186 }, 192 },
187 193
@@ -324,12 +330,12 @@
324 <nav id="mainMenuBar"></nav> 330 <nav id="mainMenuBar"></nav>
325 </section> 331 </section>
326 332
327 <section id="leftSplitter" class="leftSplitter splitter"></section> 333 <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section>
328 334
329 <section id="rightSplitter" class="rightSplitter splitter"></section> 335 <section data-montage-id="rightSplitter" class="rightSplitter splitter"></section>
330 336
331 <section id="appContainer"> 337 <section id="appContainer">
332 <section id="topSplitter" class="topSplitter splitter"></section> 338 <section data-montage-id="topSplitter" class="topSplitter splitter"></section>
333 339
334 <section id="topPanelContainer" class="panelContainer"> 340 <section id="topPanelContainer" class="panelContainer">
335 <div id="topPanel" class="panel"> 341 <div id="topPanel" class="panel">
@@ -369,10 +375,10 @@
369 </section> 375 </section>
370 </section> 376 </section>
371 377
378 <section id="breadCrumbComponent"></section>
379
372 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 380 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
373 <section id="breadCrumbTrail"> 381
374 <div id="breadCrumbComponent"></div>
375 </section>
376 <section id="bottomPanelContainer" class="panelContainer"> 382 <section id="bottomPanelContainer" class="panelContainer">
377 <section id="timelinePanel" class="panel"> 383 <section id="timelinePanel" class="panel">
378 <div id="timelinePanelComponent"></div> 384 <div id="timelinePanelComponent"></div>
@@ -381,7 +387,7 @@
381 </section> 387 </section>
382 </section> 388 </section>
383 389
384 <section id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> 390 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
385 391
386 <section id="rightPanelContainer" class="panelContainer"> 392 <section id="rightPanelContainer" class="panelContainer">
387 <section id="rightPanelContent"> 393 <section id="rightPanelContent">
@@ -389,7 +395,7 @@
389 </section> 395 </section>
390 </section> 396 </section>
391 397
392 <section id="bottomSplitter" class="bottomSplitter splitter"></section> 398 <section data-montage-id="bottomSplitter" class="bottomSplitter splitter"></section>
393 </section> 399 </section>
394 400
395 <section id="popupWindows"></section> 401 <section id="popupWindows"></section>