aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-15 16:09:47 -0800
committerValerio Virgillito2012-02-15 16:09:47 -0800
commitd366c0bd1af6471511217ed574083e15059519b5 (patch)
treec8c9f9af761457e3c5f4c6774fb0fbba851df0c4 /js/preloader
parent997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff)
parentb85bfb54aaca3ccca3c1ef09115de925cd67f4e9 (diff)
downloadninja-d366c0bd1af6471511217ed574083e15059519b5.tar.gz
Merge branch 'refs/heads/integration'
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js16
-rwxr-xr-x[-rw-r--r--]js/preloader/PreloaderWorker.js0
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
11exports.Preloader = Montage.create(Component, { 11var codeMirrorPath = "imports/codemirror";
12 12
13exports.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