diff --git a/lib/client/edward.js b/lib/client/edward.js index 63737353..690d406e 100644 --- a/lib/client/edward.js +++ b/lib/client/edward.js @@ -9,18 +9,18 @@ var join, ace, load, Util, DOM, CloudCmd, Diff, io, Zip, Format, restafary; global.edward = new Edward(); function Edward() { - var Element, - ElementMsg, + var Ace, + Emmet, Value, - Ace, + Config, + Element, FileName, Modelist, + ElementMsg, JSHintConfig, - Emmet, - Config, - MAX_FILE_SIZE, + DIR = '/modules/', Files = DOM.Files, Storage = DOM.Storage, @@ -228,7 +228,7 @@ var join, ace, load, Util, DOM, CloudCmd, Diff, io, Zip, Format, restafary; }; edward.sha = function(callback) { - var dir = '/modules/jsSHA/', + var dir = DIR + 'jsSHA/', url = dir + 'src/sha1.js'; load.js(url, function() { @@ -367,9 +367,11 @@ var join, ace, load, Util, DOM, CloudCmd, Diff, io, Zip, Format, restafary; function loadDiff(callback) { var url = join([ - '/modules/google-diff-match-patch/diff_match_patch.js', - '/modules/daffy/lib/daffy.js' - ]); + 'google-diff-match-patch/diff_match_patch.js', + 'daffy/lib/daffy.js' + ].map(function(name) { + return DIR + name; + })); DOM.load.js(url, function(error) { if (!error && !Diff) @@ -399,7 +401,7 @@ var join, ace, load, Util, DOM, CloudCmd, Diff, io, Zip, Format, restafary; } function setEmmet() { - var dir = '/modules/ace-builds/src-noconflict/', + var dir = DIR + 'ace-builds/src-noconflict/', extensions = Config.extensions, isEmmet = extensions.emmet; @@ -551,8 +553,7 @@ var join, ace, load, Util, DOM, CloudCmd, Diff, io, Zip, Format, restafary; var css = '/css/edward.css', js = '/restafary.js', - modules = '/modules/', - ace = modules + 'ace-builds/src-noconflict/', + ace = DIR + 'ace-builds/src-noconflict/', url = join([ ace + 'theme-tomorrow_night_blue', @@ -565,7 +566,7 @@ var join, ace, load, Util, DOM, CloudCmd, Diff, io, Zip, Format, restafary; exec.series([ function(callback) { - loadScript(modules + 'load/load.js', callback); + loadScript(DIR + 'load/load.js', callback); }, function(callback) {