Skip to content

Added shouldStartLoadingURL delegate method call #49

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
ehlersd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added shouldStartLoadingURL delegate method call #49

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions KINWebBrowser/KINWebBrowserViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

@protocol KINWebBrowserDelegate <NSObject>
@optional
- (BOOL)webBrowser:(KINWebBrowserViewController *)webBrowser shouldStartLoadingURL:(NSURL *)URL;
- (void)webBrowser:(KINWebBrowserViewController *)webBrowser didStartLoadingURL:(NSURL *)URL;
- (void)webBrowser:(KINWebBrowserViewController *)webBrowser didFinishLoadingURL:(NSURL *)URL;
- (void)webBrowser:(KINWebBrowserViewController *)webBrowser didFailToLoadURL:(NSURL *)URL error:(NSError *)error;
Expand Down
14 changes: 14 additions & 0 deletions KINWebBrowser/KINWebBrowserViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,12 @@ - (void)setActionButtonHidden:(BOOL)actionButtonHidden {
- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
if(webView == self.uiWebView) {

if([self.delegate respondsToSelector:@selector(webBrowser:shouldStartLoadingURL:)]) {
if(![self.delegate webBrowser:self shouldStartLoadingURL:request.URL]) {
return NO;
}
}

if(![self externalAppRequiredToOpenURL:request.URL]) {
self.uiWebViewCurrentURL = request.URL;
self.uiWebViewIsLoading = YES;
Expand Down Expand Up @@ -319,6 +325,14 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
if(webView == self.wkWebView) {

NSURL *URL = navigationAction.request.URL;

if([self.delegate respondsToSelector:@selector(webBrowser:shouldStartLoadingURL:)]) {
if(![self.delegate webBrowser:self shouldStartLoadingURL:URL]) {
decisionHandler(WKNavigationActionPolicyCancel);
return;
}
}

if(![self externalAppRequiredToOpenURL:URL]) {
if(!navigationAction.targetFrame) {
[self loadURL:URL];
Expand Down