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 929e4ef4..13ebbdbd 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 | ||
@@ -81,18 +81,18 @@ exports.Preloader = Montage.create(Component, { | |||
81 | {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, | 81 | {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"}, |
82 | {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, | 82 | {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"}, |
83 | {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, | 83 | {"type":"js", "url":"js/helper-classes/3D/glUtils.js"}, |
84 | {"type":"js", "url":"js/codemirror/mode/htmlmixed/htmlmixed.js"}, | 84 | {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"}, |
85 | {"type":"js", "url":"js/codemirror/mode/xml/xml.js"}, | 85 | {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"}, |
86 | {"type":"js", "url":"js/codemirror/mode/javascript/javascript.js"}, | 86 | {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"}, |
87 | {"type":"js", "url":"js/codemirror/mode/css/css.js"} | 87 | {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"}, |
88 | {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"} | ||
88 | ] | 89 | ] |
89 | }, | 90 | }, |
90 | 91 | ||
91 | ninjaCssRequire: { | 92 | ninjaCssRequire: { |
92 | value: | 93 | value: |
93 | [ | 94 | [ |
94 | {"type":"css", "url":"js/codemirror/lib/codemirror.css"}, | 95 | {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"} |
95 | {"type":"css", "url":"js/codemirror/theme/default.css"} | ||
96 | ] | 96 | ] |
97 | }, | 97 | }, |
98 | 98 | ||
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 | |||