diff --git a/SVWebViewController/SVModalWebViewController.m b/SVWebViewController/SVModalWebViewController.m index f801fa2..ddbac34 100644 --- a/SVWebViewController/SVModalWebViewController.m +++ b/SVWebViewController/SVModalWebViewController.m @@ -29,7 +29,7 @@ - (id)initWithURL:(NSURL *)URL { self.webViewController = [[SVWebViewController alloc] initWithURL:URL]; if (self = [super initWithRootViewController:self.webViewController]) { UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone - target:self.webViewController + target:self action:@selector(doneButtonClicked:)]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) @@ -47,4 +47,9 @@ - (void)viewWillAppear:(BOOL)animated { self.navigationBar.tintColor = self.barsTintColor; } +- (void)doneButtonClicked:(id)sender +{ + [self.webViewController dismissViewControllerAnimated:YES completion:NULL]; +} + @end diff --git a/SVWebViewController/SVWebViewController.h b/SVWebViewController/SVWebViewController.h index 42e9dfe..c2cf068 100644 --- a/SVWebViewController/SVWebViewController.h +++ b/SVWebViewController/SVWebViewController.h @@ -10,6 +10,8 @@ @interface SVWebViewController : UIViewController +@property (nonatomic, strong) UIWebView *webView; + - (id)initWithAddress:(NSString*)urlString; - (id)initWithURL:(NSURL*)URL; diff --git a/SVWebViewController/SVWebViewController.m b/SVWebViewController/SVWebViewController.m index 2e08ebc..9e81478 100644 --- a/SVWebViewController/SVWebViewController.m +++ b/SVWebViewController/SVWebViewController.m @@ -18,7 +18,6 @@ @interface SVWebViewController () @property (nonatomic, strong) UIBarButtonItem *stopBarButtonItem; @property (nonatomic, strong) UIBarButtonItem *actionBarButtonItem; -@property (nonatomic, strong) UIWebView *webView; @property (nonatomic, strong) NSURL *URL; - (id)initWithAddress:(NSString*)urlString; @@ -60,7 +59,7 @@ - (id)initWithURL:(NSURL*)pageURL { } - (void)loadURL:(NSURL *)pageURL { - [self.webView loadRequest:[NSURLRequest requestWithURL:pageURL]]; + [self.webView loadHTMLString:@"" baseURL:nil]; } #pragma mark - View lifecycle @@ -232,6 +231,10 @@ - (void)webViewDidStartLoad:(UIWebView *)webView { - (void)webViewDidFinishLoad:(UIWebView *)webView { [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO]; + if ([webView.request.URL.absoluteString isEqualToString:@"about:blank"]) { + [self.webView loadRequest:[NSURLRequest requestWithURL:self.URL]]; + return; + } self.navigationItem.title = [webView stringByEvaluatingJavaScriptFromString:@"document.title"]; [self updateToolbarItems]; @@ -262,14 +265,19 @@ - (void)stopClicked:(UIBarButtonItem *)sender { } - (void)actionButtonClicked:(id)sender { - NSArray *activities = @[[SVWebViewControllerActivitySafari new], [SVWebViewControllerActivityChrome new]]; - + NSMutableArray *activities = @[].mutableCopy; + [activities addObject:[SVWebViewControllerActivitySafari new]]; + [activities addObject:[SVWebViewControllerActivityChrome new]]; + SVWebViewControllerActivity *weixinActivity = [NSClassFromString(@"HSUActivityWeixin") new]; +// [weixinActivity performSelector:@selector(setShareTitle) withObject:self.navigationItem.title]; + [weixinActivity performSelector:@selector(setShareDescription:) withObject:self.navigationItem.title]; + SVWebViewControllerActivity *weixinMomentsActivity = [NSClassFromString(@"HSUActivityWeixinMoments") new]; +// [weixinMomentsActivity performSelector:@selector(setShareTitle) withObject:self.navigationItem.title]; + [weixinMomentsActivity performSelector:@selector(setShareDescription:) withObject:self.navigationItem.title]; + [activities addObject:weixinActivity]; + [activities addObject:weixinMomentsActivity]; UIActivityViewController *activityController = [[UIActivityViewController alloc] initWithActivityItems:@[self.self.webView.request.URL] applicationActivities:activities]; [self presentViewController:activityController animated:YES completion:nil]; } -- (void)doneButtonClicked:(id)sender { - [self dismissViewControllerAnimated:YES completion:NULL]; -} - @end diff --git a/SVWebViewController/da.lproj/SVWebViewController.strings b/SVWebViewController/da.lproj/SVWebViewController.strings deleted file mode 100644 index 56b673e..0000000 --- a/SVWebViewController/da.lproj/SVWebViewController.strings +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (c) 2013 Anders Fogh Eriksen -"Open in Safari" = "Åbn i Safari"; -"Open in Chrome" = "Åbn i Chrome"; -"Copy Link" = "Kopier Link"; -"Mail Link to this Page" = "Mail Link til denne side"; \ No newline at end of file diff --git a/SVWebViewController/en.lproj/SVWebViewController.strings b/SVWebViewController/en.lproj/SVWebViewController.strings deleted file mode 100644 index 77fdeb3..0000000 --- a/SVWebViewController/en.lproj/SVWebViewController.strings +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) 2013 Alex Ruperez -"Open in Safari" = "Open in Safari"; -"Open in Chrome" = "Open in Chrome"; \ No newline at end of file diff --git a/SVWebViewController/es-ES.lproj/SVWebViewController.strings b/SVWebViewController/es-ES.lproj/SVWebViewController.strings deleted file mode 100644 index 1021f64..0000000 --- a/SVWebViewController/es-ES.lproj/SVWebViewController.strings +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) 2013 Alex Ruperez -"Open in Safari" = "Abrir en Safari"; -"Open in Chrome" = "Abrir en Chrome"; \ No newline at end of file diff --git a/SVWebViewController/es.lproj/SVWebViewController.strings b/SVWebViewController/es.lproj/SVWebViewController.strings deleted file mode 100644 index 1021f64..0000000 --- a/SVWebViewController/es.lproj/SVWebViewController.strings +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) 2013 Alex Ruperez -"Open in Safari" = "Abrir en Safari"; -"Open in Chrome" = "Abrir en Chrome"; \ No newline at end of file diff --git a/SVWebViewController/fr.lproj/SVWebViewController.strings b/SVWebViewController/fr.lproj/SVWebViewController.strings deleted file mode 100644 index 6fff9d7..0000000 --- a/SVWebViewController/fr.lproj/SVWebViewController.strings +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) 2013 Benjamin Michotte -"Open in Safari" = "Ouvrir dans Safari"; -"Open in Chrome" = "Ouvrir dans Chrome"; \ No newline at end of file diff --git a/SVWebViewController/ja.lproj/SVWebViewController.strings b/SVWebViewController/ja.lproj/SVWebViewController.strings deleted file mode 100644 index bc9ef3b..0000000 --- a/SVWebViewController/ja.lproj/SVWebViewController.strings +++ /dev/null @@ -1,2 +0,0 @@ -"Open in Safari" = "サファリで開く"; -"Open in Chrome" = "Chromeで開く"; \ No newline at end of file diff --git a/SVWebViewController/zh-Hans.lproj/SVWebViewController.strings b/SVWebViewController/zh-Hans.lproj/SVWebViewController.strings deleted file mode 100644 index 5926fea..0000000 --- a/SVWebViewController/zh-Hans.lproj/SVWebViewController.strings +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2013 James Stout -"Open in Safari" = "在Safari中打开"; -"Open in Chrome" = "在Chrome中打开"; -"Copy Link" = "复制网页链接"; -"Mail Link to this Page" = "以电邮传送此页链接"; -"Cancel"="取消"; diff --git a/SVWebViewController/zh-Hant.lproj/SVWebViewController.strings b/SVWebViewController/zh-Hant.lproj/SVWebViewController.strings deleted file mode 100644 index af4f4a4..0000000 --- a/SVWebViewController/zh-Hant.lproj/SVWebViewController.strings +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright (c) 2013 James Stout -"Open in Safari" = "打開Safari"; -"Open in Chrome" = "打開Chrome"; \ No newline at end of file