javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #845 from emiloberg/webview-utf8

Browse Source 
web-view loads local data with UTF-8
This commit is contained in:
Vladimir Enchev
2015-09-29 16:05:22 +03:00
parent 37846ca06e 4106e6c2b8
commit 8744ba62b9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/web-view/web-view.android.ts
View File

@ -91,13 +91,13 @@ export class WebView extends common.WebView {
if (file) { if (file) {
var baseUrl = `file:///${src.substring(0, src.lastIndexOf('/') + 1)}`; var baseUrl = `file:///${src.substring(0, src.lastIndexOf('/') + 1)}`;
file.readText().then(r => { file.readText().then(r => {
this._android.loadDataWithBaseURL(baseUrl, r, "text/html", null, null); this._android.loadDataWithBaseURL(baseUrl, r, "text/html; charset=utf-8", "utf-8", null);
}); });
} }
} else if (src.indexOf("http://") === 0 || src.indexOf("https://") === 0) { } else if (src.indexOf("http://") === 0 || src.indexOf("https://") === 0) {
this._android.loadUrl(src); this._android.loadUrl(src);
} else { } else {
this._android.loadData(src, "text/html", null); this._android.loadData(src, "text/html; charset=utf-8", "utf-8");
} }
} }