github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 10:23:03 +08:00
Code Projects Activity

[mac] Fix ExecJS

Browse Source
This commit is contained in:
Lea Anthony 2021-10-30 19:28:25 +11:00
parent 86cbcdc089
commit 2dc126bf19
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v2/internal/frontend/desktop/darwin/Application.m
View File

@ -39,8 +39,9 @@ void ProcessURLResponse(void *inctx, const char *url, const char *contentType, c
void ExecJS(void* inctx, const char *script) { void ExecJS(void* inctx, const char *script) {
WailsContext *ctx = (__bridge WailsContext*) inctx; WailsContext *ctx = (__bridge WailsContext*) inctx;
NSString *nsscript = [NSString stringWithUTF8String:script];
ON_MAIN_THREAD( ON_MAIN_THREAD(
[ctx ExecJS:script]; [ctx ExecJS:nsscript];
); );
} }

2
v2/internal/frontend/desktop/darwin/WailsContext.h
View File

@ -75,7 +75,7 @@
- (void) loadRequest:(NSString*)url; - (void) loadRequest:(NSString*)url;
- (void) processURLResponse:(NSString *)url :(NSString *)contentType :(NSData*)data; - (void) processURLResponse:(NSString *)url :(NSString *)contentType :(NSData*)data;
- (void) ExecJS:(const char*)script; - (void) ExecJS:(NSString*)script;
- (NSScreen*) getCurrentScreen; - (NSScreen*) getCurrentScreen;
- (void) SetAbout :(const char*)title :(const char*)description :(void*)imagedata :(int)datalen; - (void) SetAbout :(const char*)title :(const char*)description :(void*)imagedata :(int)datalen;

7
v2/internal/frontend/desktop/darwin/WailsContext.m
View File

@ -362,9 +362,10 @@
} }
} }
- (void) ExecJS:(const char*)script { - (void) ExecJS:(NSString*)script {
NSString *nsscript = [NSString stringWithUTF8String:script]; ON_MAIN_THREAD(
[self.webview evaluateJavaScript:nsscript completionHandler:nil]; [self.webview evaluateJavaScript:script completionHandler:nil];
)
} }
- (void) processURLResponse:(NSString *)url :(NSString *)contentType :(NSData *)data { - (void) processURLResponse:(NSString *)url :(NSString *)contentType :(NSData *)data {