Skip to content

Ability to load local files in a WebView on iOS devices #4444

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

Merged
vakrilov merged 2 commits into from
Jun 28, 2017
Merged

Ability to load local files in a WebView on iOS devices #4444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7e4780
Ability to load local files in a WebView on iOS devices
EddyVerbruggen Jun 22, 2017
0137e85
Ability to load local files in a WebView on iOS devices (removed doc-…
EddyVerbruggen Jun 27, 2017
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
10 changes: 10 additions & 0 deletions tests/app/ui/web-view/test with spaces.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>MyTitle</title>
<meta charset="utf-8" />
</head>
<body>
<span style="color:red">TestÖ with Spaces</span>
</body>
</html>
34 changes: 34 additions & 0 deletions tests/app/ui/web-view/web-view-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,40 @@ export class WebViewTest extends testModule.UITest<webViewModule.WebView> {
// << webview-localfile
}

public testLoadLocalFileWithSpaceInPath(done) {
let webView = this.testView;

webView.on(webViewModule.WebView.loadFinishedEvent, function (args: webViewModule.LoadEventData) {
let actual;
let expectedTitle = 'MyTitle';
let expectedHtml = '<span style="color:red">TestÖ with Spaces</span>';

if (webView.ios) {
actual = webView.ios.stringByEvaluatingJavaScriptFromString("document.body.innerHTML").trim();
} else if (webView.android) {
actual = webView.android.getTitle();
}

try {
TKUnit.assertNull(args.error, args.error);
TKUnit.assertEqual(actual, webView.ios ? expectedHtml : expectedTitle, "File ~/ui/web-view/test.html not loaded properly.");
done(null);
}
catch (e) {
done(e);
}

let message;
if (!args.error) {
message = "WebView finished loading " + args.url;
}
else {
message = "Error loading " + args.url + ": " + args.error;
}
});
webView.src = "~/ui/web-view/test with spaces.html";
}

public testLoadHTMLString(done) {
let webView = this.testView;

Expand Down
5 changes: 5 additions & 0 deletions tns-core-modules/ui/web-view/web-view-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ export abstract class WebViewBase extends View implements WebViewDefinition {
src = "file://" + src;
}

// loading local files from paths with spaces may fail
if (src.toLowerCase().indexOf("file:///") === 0) {
src = encodeURI(src);
}

if (src.toLowerCase().indexOf("http://") === 0 ||
src.toLowerCase().indexOf("https://") === 0 ||
src.toLowerCase().indexOf("file:///") === 0) {
Expand Down