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

Merge pull request #992 from NativeScript/android6-webview

Browse Source 
android 6 support
This commit is contained in:
Vladimir Enchev
2015-10-29 10:24:26 +02:00
parent 009c818e75 b738e51cb3
commit 0a2b91fbe7
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android17.d.ts vendored
View File

@ -151344,7 +151344,8 @@ declare module android {
* @param description A String describing the error.
* @param failingUrl The url that failed to load.
*/
public onReceivedError(view: android.webkit.WebView, errorCode: number, description: string, failingUrl: string): void;
public onReceivedError(view: android.webkit.WebView, errorCode: number, description: string, failingUrl: string): void;
public onReceivedError(view: android.webkit.WebView, request, error): void;
/**
* As the host application if the browser should resend data as the requested page was a result of a POST. The default is to not resend the data.
* @param view The WebView that is initiating the callback.

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

@ -37,13 +37,33 @@ class WebViewClientClass extends android.webkit.WebViewClient {
}
}
public onReceivedError(view: android.webkit.WebView, errorCode: number, description: string, failingUrl: string) {
super.onReceivedError(view, errorCode, description, failingUrl);
public onReceivedError() {
var view: android.webkit.WebView = arguments[0];
if (this._view) {
trace.write("WebViewClientClass.onReceivedError(" + errorCode + ", " + description + ", " + failingUrl + ")", trace.categories.Debug);
this._view._onLoadFinished(failingUrl, description + "(" + errorCode + ")");
}
if (arguments.length === 4) {
var errorCode: number = arguments[1];
var description: string = arguments[2];
var failingUrl: string = arguments[3];
super.onReceivedError(view, errorCode, description, failingUrl);
if (this._view) {
trace.write("WebViewClientClass.onReceivedError(" + errorCode + ", " + description + ", " + failingUrl + ")", trace.categories.Debug);
this._view._onLoadFinished(failingUrl, description + "(" + errorCode + ")");
}
} else {
var request: any = arguments[1];
var error: any = arguments[2];
super.onReceivedError(view, request, error);
if (this._view) {
trace.write("WebViewClientClass.onReceivedError(" + error.getErrorCode() + ", " + error.getDescription() + ", " + error.getUrl() + ")", trace.categories.Debug);
this._view._onLoadFinished(error.getUrl(), error.getDescription() + "(" + error.getErrorCode() + ")");
}
}
}
};