From 950a9772adbc0a6d1b9a5bf747ade9034cc987b5 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 26 Sep 2014 03:08:00 -0400 Subject: [PATCH] refactor(edit) getEditConfig -> Files.get --- lib/client/edit.js | 27 +++------------------------ lib/client/files.js | 2 +- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/lib/client/edit.js b/lib/client/edit.js index a3bf3c0c..18102372 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -10,6 +10,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI DIR = CloudCmd.LIBDIRCLIENT + 'edit/', LIBDIR = CloudCmd.LIBDIR, Info = DOM.CurrentInfo, + Files = DOM.Files, join = CloudCmd.join, @@ -147,7 +148,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI } function setEmmet(isHTML) { - getEditConfig(function(error, config) { + DOM.Files.get('edit', function(error, config) { var extensions = config.extensions, isEmmet = extensions.emmet; @@ -223,7 +224,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI ace.require('ace/ext/language_tools'); Modelist = ace.require('ace/ext/modelist'); - getEditConfig(function(error, config) { + Files.get('edit', function(error, config) { var options = config.options; Ace.setOptions(options); @@ -357,28 +358,6 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI }); } - function getEditConfig(callback) { - Util.checkArgs(arguments, ['callback']); - - if (!PromiseConfig) - PromiseConfig = new Promise(function(resolve, reject) { - var prefix = CloudCmd.PREFIX, - url = '/json/edit.json'; - - DOM.load.ajax({ - url : prefix + url, - success : resolve, - error : reject - }); - }); - - PromiseConfig.then(function(data) { - callback(null, data); - }, function(error) { - callback(error); - }); - } - function setMenu() { if (!Menu) { DOM.loadMenu(function(error) { diff --git a/lib/client/files.js b/lib/client/files.js index 1fc6914b..17de865a 100644 --- a/lib/client/files.js +++ b/lib/client/files.js @@ -13,7 +13,7 @@ var Util, DOM, CloudCmd; var Promises = {}, Storage = DOM.Storage, Files = this, - FILES_JSON = 'config|modules|ext', + FILES_JSON = 'config|modules|ext|edit', FILES_HTML = 'file|path|link|pathLink|media', FILES_HTML_ROOT = 'view/media-tmpl|config-tmpl', funcs = [],