github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 20:33:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (tweaks to setWebViewClient)

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java
	framework/src/org/apache/cordova/CordovaWebViewClient.java
This commit is contained in:
Andrew Grieve 2014-07-07 16:38:50 -04:00
commit 67006add53
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
framework/src/org/apache/cordova/AndroidWebView.java
View File

@ -290,16 +290,26 @@ public class AndroidWebView extends WebView implements CordovaWebView {
this.addJavascriptInterface(exposedJsApi, "_cordovaNative"); this.addJavascriptInterface(exposedJsApi, "_cordovaNative");
} }
@Override
public void setWebViewClient(WebViewClient client) {
this.viewClient = (CordovaWebViewClient)client;
super.setWebViewClient(client);
}
@Override
public void setWebChromeClient(WebChromeClient client) {
this.chromeClient = (CordovaChromeClient)client;
super.setWebChromeClient(client);
}
@Override @Override
public void setWebViewClient(CordovaWebViewClient client) { public void setWebViewClient(CordovaWebViewClient client) {
this.viewClient = client; setWebViewClient((WebViewClient) client);
super.setWebViewClient((WebViewClient) client);
} }
@Override @Override
public void setWebChromeClient(CordovaChromeClient client) { public void setWebChromeClient(CordovaChromeClient client) {
this.chromeClient = client; setWebChromeClient((WebChromeClient) client);
super.setWebChromeClient((WebChromeClient) client);
} }
public CordovaChromeClient getWebChromeClient() { public CordovaChromeClient getWebChromeClient() {