diff options
author | Jon Reid | 2012-03-06 14:15:18 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 14:15:18 -0800 |
commit | 78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3 (patch) | |
tree | c395b703f21431dcb4432c725f4c860431add61b /js/ninja.reel/ninja.html | |
parent | fa8b81d4f436c0b8564c8dcdd22d8dd6d5bccfaa (diff) | |
parent | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff) | |
download | ninja-78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3.tar.gz |
Merge branch 'Timeline-uber' into timeline-serialized
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 112f844e..cdf53ddf 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", |