public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #851 from mihaip/fix-target-blank-links

Browse source 
Fix tapping on target=_blank links not working in the original story view
This commit is contained in:
Samuel Clay 2015-12-21 15:47:48 -07:00
commit 44de300579
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/ios/Classes/OriginalStoryViewController.m
View file

@ -287,10 +287,10 @@
[webView reload];
}
# pragma mark: -
# pragma mark: UIWebViewDelegate protocol
# pragma mark -
# pragma mark WKNavigationDelegate protocol
- (void)webView:(UIWebView *)aWebView didCommitNavigation:(null_unspecified WKNavigation *)navigation {
- (void)webView:(WKWebView *)aWebView didCommitNavigation:(null_unspecified WKNavigation *)navigation {
if ([webView canGoBack]) {
[backBarButton setEnabled:YES];
} else {
@ -310,7 +310,7 @@
finishedLoading = YES;
}
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
- (void)webView:(WKWebView *)webView didFailLoadWithError:(NSError *)error
{
[UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
@ -323,7 +323,21 @@
finishedLoading = YES;
}
- (void)updateTitle:(UIWebView*)aWebView
# pragma mark -
# pragma mark WKUIDelegate protocol
- (nullable WKWebView *)webView:(WKWebView *)aWebView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures {
if (!navigationAction.targetFrame.isMainFrame) {
// Load target="_blank" links into the same frame.
[webView loadRequest:navigationAction.request];
}
return nil;
}
# pragma mark -
- (void)updateTitle:(WKWebView*)aWebView
{
NSString *pageTitleValue = webView.title;
titleView.text = [pageTitleValue stringByDecodingHTMLEntities];