Merge branch 'v2-alpha' into v2-alpha

This commit is contained in:
Lea Anthony
2021-09-15 23:33:33 +10:00
committed by GitHub
3 changed files with 6 additions and 4 deletions

View File

@@ -144,7 +144,10 @@ func generateBindings(bindings *binding.Bindings) error {
}
targetDir := filepath.Join(projectConfig.WailsJSDir, "wailsjs", "go")
println("TargetDir =", targetDir)
err = os.RemoveAll(targetDir)
if err != nil {
return err
}
_ = fs.MkDirs(targetDir)
modelsFile := filepath.Join(targetDir, "models.ts")
err = bindings.WriteTS(modelsFile)

View File

@@ -261,6 +261,7 @@ func (f *Frontend) setupChromium() {
chromium.WebResourceRequestedCallback = f.processRequest
chromium.NavigationCompletedCallback = f.navigationCompleted
acceleratorsWebviewShouldProcess := slicer.Int([]int{ctrlV, ctrlC, ctrlX, ctrlZ, ctrlA, arrowLeft, arrowRight, arrowUp, arrowDown, keyDel})
chromium.AcceleratorKeyCallback = func(vkey uint) bool {
// We want webview to handle ctrl-C, ctrl-Z, ctrl-v, ctrl-x
if acceleratorsWebviewShouldProcess.Contains(int(vkey)) {

View File

@@ -375,9 +375,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
func generateRuntimeWrapper(options *Options) error {
wrapperDir := filepath.Join(options.WailsJSDir, "wailsjs", "runtime")
if fs.DirExists(wrapperDir) {
return nil
}
_ = os.RemoveAll(wrapperDir)
extractor := gosod.New(wrapper.RuntimeWrapper)
return extractor.Extract(wrapperDir, nil)
}