Fix binary files not showing anything in edit mode

This commit is contained in:
Phil Hughes 2017-11-01 13:03:19 +00:00
parent e457f3fbff
commit 984f3b7dff
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
2 changed files with 20 additions and 6 deletions

View File

@ -27,6 +27,8 @@ export default {
'changeFileContent',
]),
initMonaco() {
if (this.shouldHideEditor) return;
if (this.monacoInstance) {
this.monacoInstance.setModel(null);
}
@ -94,8 +96,12 @@ export default {
<template>
<div
id="ide"
v-if='!shouldHideEditor'
class="blob-viewer-container blob-editor-container"
>
<div
v-if="shouldHideEditor"
v-html="activeFile.html"
>
</div>
</div>
</template>

View File

@ -17,6 +17,7 @@ describe('RepoEditor', () => {
f.active = true;
f.tempFile = true;
vm.$store.state.openFiles.push(f);
vm.$store.getters.activeFile.html = 'testing';
vm.monaco = true;
vm.$mount();
@ -31,18 +32,25 @@ describe('RepoEditor', () => {
it('renders an ide container', (done) => {
Vue.nextTick(() => {
expect(vm.shouldHideEditor).toBeFalsy();
expect(vm.$el.textContent.trim()).toBe('');
done();
});
});
describe('when open file is binary and not raw', () => {
it('does not render the IDE', (done) => {
beforeEach((done) => {
vm.$store.getters.activeFile.binary = true;
Vue.nextTick(() => {
expect(vm.shouldHideEditor).toBeTruthy();
done();
});
Vue.nextTick(done);
});
it('does not render the IDE', () => {
expect(vm.shouldHideEditor).toBeTruthy();
});
it('shows activeFile html', () => {
expect(vm.$el.textContent.trim()).toBe('testing');
});
});
});