Skip to content
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

Jump to bottom

[TIMOB-9593] 3_0_X Use data scheme when setting html text #3805

Merged
merged 2 commits into from
Jan 28, 2013
Merged

[TIMOB-9593] 3_0_X Use data scheme when setting html text #3805

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
104ae04
[TIMOB-9593] Use data scheme when setting html text
vishalduggal Jan 25, 2013
707ef0d
[TIMOB-9593] Use data scheme when setting html text
vishalduggal Jan 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiUIWebView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ private String escapeContent(String content)

public void setHtml(String html)
{
setHtmlInternal(html, TiC.URL_ANDROID_ASSET_RESOURCES, "text/html");
setHtmlInternal(html, "data://", "text/html");
}

public void setHtml(String html, KrollDict d)
Expand All @@ -390,7 +390,7 @@ public void setHtml(String html, KrollDict d)
return;
}

String baseUrl = TiC.URL_ANDROID_ASSET_RESOURCES;
String baseUrl = "data://";
String mimeType = "text/html";
if (d.containsKey(TiC.PROPERTY_BASE_URL_WEBVIEW)) {
baseUrl = TiConvert.toString(d.get(TiC.PROPERTY_BASE_URL_WEBVIEW));
Expand Down