Unverified Commit 5cf6508f authored by David Zagi's avatar David Zagi Committed by GitHub

Merge branch 'master' into remixd_terminal

parents 9858d121 6cbea7c6
...@@ -80,6 +80,7 @@ export class CompileTabLogic { ...@@ -80,6 +80,7 @@ export class CompileTabLogic {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.api.readFile(target).then((content) => { this.api.readFile(target).then((content) => {
const sources = { [target]: { content } } const sources = { [target]: { content } }
this.event.emit('removeAnnotations')
this.event.emit('startingCompilation') this.event.emit('startingCompilation')
// setTimeout fix the animation on chrome... (animation triggered by 'staringCompilation') // setTimeout fix the animation on chrome... (animation triggered by 'staringCompilation')
setTimeout(() => { this.compiler.compile(sources, target); resolve(true) }, 100) setTimeout(() => { this.compiler.compile(sources, target); resolve(true) }, 100)
...@@ -122,7 +123,6 @@ export class CompileTabLogic { ...@@ -122,7 +123,6 @@ export class CompileTabLogic {
} }
// TODO readd saving current file // TODO readd saving current file
this.api.saveCurrentFile() this.api.saveCurrentFile()
this.event.emit('removeAnnotations')
var currentFile = this.api.currentFile var currentFile = this.api.currentFile
return this.compileFile(currentFile) return this.compileFile(currentFile)
} catch (err) { } catch (err) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment