aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-28 14:01:05 -0800
committerPushkar Joshi2012-02-28 14:01:05 -0800
commit63307c9abf120985d979a40a53a0598d3f0d5c5a (patch)
tree57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/ninja.reel
parente1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz
Merge branch 'master' into pentool
Conflicts: manifest.json
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1393b4b9..b1fb6352 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": {
@@ -324,12 +324,12 @@
324 <nav id="mainMenuBar"></nav> 324 <nav id="mainMenuBar"></nav>
325 </section> 325 </section>
326 326
327 <section id="leftSplitter" class="leftSplitter splitter"></section> 327 <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section>
328 328
329 <section id="rightSplitter" class="rightSplitter splitter"></section> 329 <section data-montage-id="rightSplitter" class="rightSplitter splitter"></section>
330 330
331 <section id="appContainer"> 331 <section id="appContainer">
332 <section id="topSplitter" class="topSplitter splitter"></section> 332 <section data-montage-id="topSplitter" class="topSplitter splitter"></section>
333 333
334 <section id="topPanelContainer" class="panelContainer"> 334 <section id="topPanelContainer" class="panelContainer">
335 <div id="topPanel" class="panel"> 335 <div id="topPanel" class="panel">
@@ -369,7 +369,7 @@
369 </section> 369 </section>
370 </section> 370 </section>
371 371
372 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 372 <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
373 <section id="breadCrumbTrail"> 373 <section id="breadCrumbTrail">
374 <div id="breadCrumbComponent"></div> 374 <div id="breadCrumbComponent"></div>
375 </section> 375 </section>
@@ -381,7 +381,7 @@
381 </section> 381 </section>
382 </section> 382 </section>
383 383
384 <section id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> 384 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
385 385
386 <section id="rightPanelContainer" class="panelContainer"> 386 <section id="rightPanelContainer" class="panelContainer">
387 <section id="rightPanelContent"> 387 <section id="rightPanelContent">
@@ -389,7 +389,7 @@
389 </section> 389 </section>
390 </section> 390 </section>
391 391
392 <section id="bottomSplitter" class="bottomSplitter splitter"></section> 392 <section data-montage-id="bottomSplitter" class="bottomSplitter splitter"></section>
393 </section> 393 </section>
394 394
395 <section id="popupWindows"></section> 395 <section id="popupWindows"></section>