Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

refactor(edit) setEmmet: rm isHTML

Browse source
This commit is contained in:
coderaiser 2014-10-10 10:47:38 -04:00
parent 3c4d5cb628
commit efb0b8c65d
1 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
lib/client/edit.js
View file

@ -40,7 +40,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
Ace.focus();
}
};
function init(callback) {
Util.exec.series([
CloudCmd.View,
@ -129,16 +129,18 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
this.setModeForPath = function(name) {
var modesByName = Modelist.modesByName,
mode = Modelist.getModeForPath(name).mode,
htmlMode = modesByName.html.mode,
jsMode = modesByName.javascript.mode,
isHTML = mode === htmlMode,
isJS = mode === jsMode;
Session.setMode(mode);
setUseOfWorker(mode);
setEmmet(isHTML);
if (isHTML)
setEmmet();
if (isJS && Session.getUseWorker())
setJsHintConfig();
@ -168,34 +170,30 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
}
}
function setEmmet(isHTML) {
function setEmmet() {
DOM.Files.get('edit', function(error, config) {
var extensions = config.extensions,
isEmmet = extensions.emmet;
if (isEmmet && isHTML)
if (isEmmet)
Util.exec.if(Emmet, function() {
Ace.setOption('enableEmmet', isHTML);
}, function(callback) {
var url;
Ace.setOption('enableEmmet', true);
}, function(callback) {
var url;
url = join([
DIR + 'emmet.js',
DIR + 'ext-emmet.js'
]);
DOM.load.js(url, function() {
Emmet = ace.require('ace/ext/emmet');
Emmet.setCore(window.emmet);
if (!isHTML) {
callback();
} else {
url = join([
DIR + 'emmet.js',
DIR + 'ext-emmet.js'
]);
DOM.load.js(url, function() {
Emmet = ace.require('ace/ext/emmet');
Emmet.setCore(window.emmet);
callback();
});
}
callback();
});
});
});
}
function setUseOfWorker(mode) {