btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge branch 'master' into feature/prettier-formatting

Browse Source
This commit is contained in:
James George
2020-02-25 14:40:25 +05:30
committed by GitHub
parent 13c85b3a45 09d98cff7d
commit 19bfa3a7c3
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/ace-editor.vue
View File

@@ -81,6 +81,13 @@ export default {
...this.options, ...this.options,
}) })
// Set the theme and show the editor only after it's been set to prevent FOUC.
editor.setTheme(`ace/theme/${this.defineTheme()}`, () => {
this.$nextTick().then(() => {
this.initialized = true;
});
});
if (this.value) editor.setValue(this.value, 1); if (this.value) editor.setValue(this.value, 1);
this.editor = editor this.editor = editor
@@ -102,9 +109,8 @@ export default {
}, },
}, },
beforeDestroy() { destroyed() {
this.editor.destroy(); this.editor.destroy();
this.editor.container.remove();
} }
}; };
</script> </script>

7
components/graphql/queryeditor.vue
View File

@@ -97,6 +97,13 @@ export default {
}); });
}); });
// Set the theme and show the editor only after it's been set to prevent FOUC.
editor.setTheme(`ace/theme/${this.defineTheme()}`, () => {
this.$nextTick().then(() => {
this.initialized = true;
});
});
const completer = { const completer = {
getCompletions: (editor, _session, { row, column }, _prefix, callback) => { getCompletions: (editor, _session, { row, column }, _prefix, callback) => {
if (this.validationSchema) { if (this.validationSchema) {