Fix: make updateLinter wait linterConfig to load
This commit is contained in:
parent
96a046f774
commit
368bb34811
12
edit/lint.js
12
edit/lint.js
|
@ -130,6 +130,13 @@ var linterConfig = {
|
||||||
}
|
}
|
||||||
}, 2000);
|
}, 2000);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
init() {
|
||||||
|
if (!linterConfig.init.pending) {
|
||||||
|
linterConfig.init.pending = linterConfig.loadAll();
|
||||||
|
}
|
||||||
|
return linterConfig.init.pending;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
function initLint() {
|
function initLint() {
|
||||||
|
@ -143,7 +150,7 @@ function initLint() {
|
||||||
$('#lint h2').addEventListener('click', toggleLintReport);
|
$('#lint h2').addEventListener('click', toggleLintReport);
|
||||||
}
|
}
|
||||||
|
|
||||||
linterConfig.loadAll().then(updateLinter);
|
updateLinter();
|
||||||
linterConfig.watchStorage();
|
linterConfig.watchStorage();
|
||||||
prefs.subscribe(['editor.linter'], updateLinter);
|
prefs.subscribe(['editor.linter'], updateLinter);
|
||||||
}
|
}
|
||||||
|
@ -155,7 +162,8 @@ function updateLinter({immediately, linter = prefs.get('editor.linter')} = {}) {
|
||||||
}
|
}
|
||||||
const GUTTERS_CLASS = 'CodeMirror-lint-markers';
|
const GUTTERS_CLASS = 'CodeMirror-lint-markers';
|
||||||
|
|
||||||
loadLinterAssets(linter).then(updateEditors);
|
Promise.all([linterConfig.init(), loadLinterAssets(linter)])
|
||||||
|
.then(updateEditors);
|
||||||
$('#linter-settings').style.display = !linter ? 'none' : 'inline-block';
|
$('#linter-settings').style.display = !linter ? 'none' : 'inline-block';
|
||||||
$('#lint').style.display = 'none';
|
$('#lint').style.display = 'none';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user