aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-09 13:36:41 -0800
committerJose Antonio Marquez2012-03-09 13:36:41 -0800
commit9a03f869ff4520431da3ac8c64b748b5fbb60339 (patch)
treedad948f012cbc7d65e0dccde273667a389ff1c6d /js/ninja.reel/ninja.html
parentb0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (diff)
parentb4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff)
downloadninja-9a03f869ff4520431da3ac8c64b748b5fbb60339.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html17
1 files changed, 8 insertions, 9 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a20a6090..8f6f6d7b 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -16,12 +16,6 @@
16 16
17 <script type="text/montage-serialization"> 17 <script type="text/montage-serialization">
18 { 18 {
19
20 "preloader1": {
21 "module": "js/preloader/preloader",
22 "name": "Preloader"
23 },
24
25 "localStorage": { 19 "localStorage": {
26 "module": "js/controllers/local-storage-controller", 20 "module": "js/controllers/local-storage-controller",
27 "name": "LocalStorage" 21 "name": "LocalStorage"
@@ -37,6 +31,11 @@
37 "name": "AppModel" 31 "name": "AppModel"
38 }, 32 },
39 33
34 "materialsModel": {
35 "module": "js/models/materials-model",
36 "name": "MaterialsModel"
37 },
38
40 "menu": { 39 "menu": {
41 "module": "js/components/menu/menu.reel", 40 "module": "js/components/menu/menu.reel",
42 "name": "Menu", 41 "name": "Menu",
@@ -167,7 +166,7 @@
167 }, 166 },
168 167
169 "panelContainer": { 168 "panelContainer": {
170 "module": "js/panels/PanelContainer/PanelContainer.reel", 169 "module": "js/panels/PanelContainer.reel",
171 "name": "PanelContainer", 170 "name": "PanelContainer",
172 "properties": { 171 "properties": {
173 "element": {"#": "rightPanelContent"}, 172 "element": {"#": "rightPanelContent"},
@@ -389,8 +388,8 @@
389 388
390 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section> 389 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
391 390
392 <section id="rightPanelContainer" class="panelContainer"> 391 <section id="rightPanelContainer" class="rightPanelContainer panelContainer">
393 <section id="rightPanelContent"> 392 <section id="rightPanelContent" class="rightPanelContent">
394 </section> 393 </section>
395 </section> 394 </section>
396 </section> 395 </section>