taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-02 13:19:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes to serve/build

Browse Source
This commit is contained in:
Lea Anthony
2019-02-13 08:44:53 +11:00
parent 9694dc57aa
commit 5994eb605f
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/default/wailsbridge.js
View File

@@ -188,7 +188,7 @@ function startBridge() {
// Call back
case "c":
var callbackData = message.data.slice(1);
log("Callback = " + callbackData);
window.wailsbridge.log("Callback = " + callbackData);
window.wails._.callback(callbackData);
break;
}

2
assets/default/wailsbridge.prod.js
View File

@@ -11,7 +11,7 @@ export default {
// Passes the main Wails object to the callback if given.
Start: function(callback) {
if (callback) {
callback();
window.wails.events.on("wails:ready", callback);
}
}
};

5
cmd/helpers.go
View File

@@ -134,7 +134,7 @@ func CheckPackr() (err error) {
}
// InstallFrontendDeps attempts to install the frontend dependencies based on the given options
func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool) error {
func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool, caller string) error {
// Install frontend deps
err := os.Chdir(projectOptions.FrontEnd.Dir)
@@ -189,6 +189,9 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
}
bridgeFile := "wailsbridge.prod.js"
if caller == "serve" {
bridgeFile = "wailsbridge.js"
}
// Copy bridge to project
_, filename, _, _ := runtime.Caller(1)

2
cmd/wails/4_build.go
View File

@@ -70,7 +70,7 @@ func init() {
// Install deps
if projectOptions.FrontEnd != nil {
err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "build")
if err != nil {
return err
}

2
cmd/wails/6_serve.go
View File

@@ -66,7 +66,7 @@ func init() {
// Install deps
if projectOptions.FrontEnd != nil {
err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "serve")
if err != nil {
return err
}