Merge pull request #998 from NativeScript/webview-ios-images

web-view images now will be loaded correctly with base url
This commit is contained in:
Vladimir Enchev
2015-10-29 11:42:08 +02:00
2 changed files with 4 additions and 3 deletions

View File

@ -1,6 +1,6 @@
<Page>
<StackLayout orientation="vertical">
<WebView src="~/web-view/test.html" height="50" />
<WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./pages/test2.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" height="75" />
<WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./ui-tests-app/pages/test2.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" height="75" />
</StackLayout>
</Page>

View File

@ -1,5 +1,6 @@
import common = require("./web-view-common");
import trace = require("trace");
import fs = require("file-system");
global.moduleMerge(common, exports);
@ -99,8 +100,8 @@ export class WebView extends common.WebView {
this._ios.loadRequest(NSURLRequest.requestWithURL(NSURL.URLWithString(src)));
}
public _loadData(src: string) {
this._ios.loadHTMLStringBaseURL(src, null);
public _loadData(content: string) {
this._ios.loadHTMLStringBaseURL(content, NSURL.alloc().initWithString(`file:///${fs.knownFolders.currentApp().path}/`));
}
get canGoBack(): boolean {