diff options
author | Jose Antonio Marquez | 2012-03-06 17:02:44 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-06 17:02:44 -0800 |
commit | fca92904597895675ddd216399cd235f3c5a7cfa (patch) | |
tree | 77c30a958c0283a6aa208b93640c6008eeb943e2 /js/ninja.reel/ninja.html | |
parent | ec7cbc95de031d2be667c2a8629a9d63e91f7e1a (diff) | |
parent | eebb7de4d19cddec9c763a073d8cf41d76fe70f7 (diff) | |
download | ninja-fca92904597895675ddd216399cd235f3c5a7cfa.tar.gz |
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 112f844e..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"}, |