From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/preloader/Preloader.js       | 16 ++++++++--------
 js/preloader/PreloaderWorker.js |  0
 2 files changed, 8 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 js/preloader/PreloaderWorker.js

(limited to 'js/preloader')

diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index f137f4b6..41768cfa 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -8,14 +8,14 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
     defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
 
-exports.Preloader = Montage.create(Component, {
+var codeMirrorPath = "imports/codemirror";
 
+exports.Preloader = Montage.create(Component, {
 
     ninjaJsRequire: {
         value:
             [
                 {"type":"js", "url":"js/helper-classes/3D/GLMatrix/gl-matrix.js"},
-                {"type":"js", "url":"js/codemirror/lib/codemirror.js"},
 
                 //{"type":"js", "url":"js/helper-classes/RDGE/rdge-compiled.js"},
 
@@ -91,18 +91,18 @@ exports.Preloader = Montage.create(Component, {
                 {"type":"js", "url":"js/helper-classes/RDGE/precompiled.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/MaterialsLibrary.js"},
                 {"type":"js", "url":"js/helper-classes/3D/glUtils.js"},                
-                {"type":"js", "url":"js/codemirror/mode/htmlmixed/htmlmixed.js"},
-                {"type":"js", "url":"js/codemirror/mode/xml/xml.js"},
-                {"type":"js", "url":"js/codemirror/mode/javascript/javascript.js"},
-                {"type":"js", "url":"js/codemirror/mode/css/css.js"}
+                {"type":"js", "url": codeMirrorPath + "/lib/codemirror.js"},
+                {"type":"js", "url": codeMirrorPath + "/mode/htmlmixed/htmlmixed.js"},
+                {"type":"js", "url": codeMirrorPath + "/mode/xml/xml.js"},
+                {"type":"js", "url": codeMirrorPath + "/mode/javascript/javascript.js"},
+                {"type":"js", "url": codeMirrorPath + "/mode/css/css.js"}
             ]
     },
 
     ninjaCssRequire: {
         value:
             [
-                {"type":"css", "url":"js/codemirror/lib/codemirror.css"},
-                {"type":"css", "url":"js/codemirror/theme/default.css"}
+                {"type":"css", "url": codeMirrorPath + "/lib/codemirror.css"}
             ]
     },
 
diff --git a/js/preloader/PreloaderWorker.js b/js/preloader/PreloaderWorker.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3