Skip to content

Add WKUIDelegate to handle JavaScript alerts and confirms #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shawntz wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Add WKUIDelegate to handle JavaScript alerts and confirms #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions cmd/cassh-menubar/webview_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,32 @@ void handleCasshURL(char* url);
}
@end

// UI delegate to handle JavaScript alerts and confirms
@interface WebViewUIDelegate : NSObject <WKUIDelegate>
@end

@implementation WebViewUIDelegate
- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler {
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:message];
[alert addButtonWithTitle:@"OK"];
[alert runModal];
completionHandler();
}

- (void)webView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL))completionHandler {
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:message];
[alert addButtonWithTitle:@"OK"];
[alert addButtonWithTitle:@"Cancel"];
NSModalResponse response = [alert runModal];
completionHandler(response == NSAlertFirstButtonReturn);
}
@end

static WebViewDelegate* navDelegate = nil;
static WindowDelegate* windowDelegate = nil;
static WebViewUIDelegate* uiDelegate = nil;

// Setup Edit menu for copy/paste support
void setupEditMenu() {
Expand Down Expand Up @@ -202,6 +226,12 @@ void openWebViewWindow(const char* urlStr, const char* title, int width, int hei
}
webView.navigationDelegate = navDelegate;

// Set UI delegate for JavaScript alerts/confirms
if (uiDelegate == nil) {
uiDelegate = [[WebViewUIDelegate alloc] init];
}
webView.UIDelegate = uiDelegate;

// Add webview to container
[containerView addSubview:webView];
containerView.autoresizesSubviews = YES;
Expand Down
Loading