diff options
Diffstat (limited to 'js/preloader')
-rwxr-xr-x | js/preloader/Preloader.js | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | js/preloader/PreloaderWorker.js | 0 |
2 files changed, 8 insertions, 8 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index d735af0b..b3bd1b23 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
@@ -8,14 +8,14 @@ var Montage = require("montage/core/core").Montage, | |||
8 | Component = require("montage/ui/component").Component, | 8 | Component = require("montage/ui/component").Component, |
9 | defaultEventManager = require("montage/core/event/event-manager").defaultEventManager; | 9 | defaultEventManager = require("montage/core/event/event-manager").defaultEventManager; |
10 | 10 | ||
11 | exports.Preloader = Montage.create(Component, { | 11 | var codeMirrorPath = "imports/codemirror"; |
12 | 12 | ||
13 | exports.Preloader = Montage.create(Component, { | ||
13 | 14 | ||
14 | ninjaJsRequire: { | 15 | ninjaJsRequire: { |
15 | value: | 16 | value: |
16 | [ | 17 | [ |
17 | {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, | 18 | {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"}, |
18 | {"type":"js", "url":"js/codemirror/lib/codemirror.js"}, | ||
19 | 19 | ||
20 | //{"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, | 20 | //{"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"}, |
21 | 21 | ||
@@ -91,18 +91,18 @@ exports.Preloader = Montage.create(Component, { | |||
91 | {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, | 91 | {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, |
92 | {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, | 92 | {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, |
93 | {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, | 93 | {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, |
94 | {"type":"js", "url":"js/codemirror/mode/htmlmixed/htmlmixed.js"}, | 94 | {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"}, |
95 | {"type":"js", "url":"js/codemirror/mode/xml/xml.js"}, | 95 | {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"}, |
96 | {"type":"js", "url":"js/codemirror/mode/javascript/javascript.js"}, | 96 | {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"}, |
97 | {"type":"js", "url":"js/codemirror/mode/css/css.js"} | 97 | {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"}, |
98 | {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"} | ||
98 | ] | 99 | ] |
99 | }, | 100 | }, |
100 | 101 | ||
101 | ninjaCssRequire: { | 102 | ninjaCssRequire: { |
102 | value: | 103 | value: |
103 | [ | 104 | [ |
104 | {"type":"css", "url":"js/codemirror/lib/codemirror.css"}, | 105 | {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"} |
105 | {"type":"css", "url":"js/codemirror/theme/default.css"} | ||
106 | ] | 106 | ] |
107 | }, | 107 | }, |
108 | 108 | ||
diff --git a/js/preloader/PreloaderWorker.js b/js/preloader/PreloaderWorker.js index 1b5b58ed..1b5b58ed 100644..100755 --- a/js/preloader/PreloaderWorker.js +++ b/js/preloader/PreloaderWorker.js | |||