Merge pull request marcuswestin#75 from kanflo/master

marcuswestin · marcuswestin · commit c56fdb62121c · 2014-03-29T13:09:36.000+01:00
marcuswestin#74 Not possible to load external javascript in ExampleApp.html
diff --git a/Example Apps/ExampleApp-iOS/ExampleAppViewController.m b/Example Apps/ExampleApp-iOS/ExampleAppViewController.m
@@ -83,6 +83,7 @@ - (void)callHandler:(id)sender {
 - (void)loadExamplePage:(UIWebView*)webView {
     NSString* htmlPath = [[NSBundle mainBundle] pathForResource:@"ExampleApp" ofType:@"html"];
     NSString* appHtml = [NSString stringWithContentsOfFile:htmlPath encoding:NSUTF8StringEncoding error:nil];
-    [webView loadHTMLString:appHtml baseURL:nil];
+    NSURL *baseURL = [NSURL fileURLWithPath:htmlPath];
+    [webView loadHTMLString:appHtml baseURL:baseURL];
 }
 @end

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ - (void)callHandler:(id)sender {`
`83`	`83`	`- (void)loadExamplePage:(UIWebView*)webView {`
`84`	`84`	`NSString* htmlPath = [[NSBundle mainBundle] pathForResource:@"ExampleApp" ofType:@"html"];`
`85`	`85`	`NSString* appHtml = [NSString stringWithContentsOfFile:htmlPath encoding:NSUTF8StringEncoding error:nil];`
`86`		`- [webView loadHTMLString:appHtml baseURL:nil];`
	`86`	`+ NSURL *baseURL = [NSURL fileURLWithPath:htmlPath];`
	`87`	`+ [webView loadHTMLString:appHtml baseURL:baseURL];`
`87`	`88`	`}`
`88`	`89`	`@end`