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

[CB-1950] InAppBrowser - support events

Browse Source
This commit is contained in:
Shazron Abdullah 2012-11-30 05:40:59 -08:00
parent 2c202b82d7
commit 432aec62a9
1 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
framework/src/org/apache/cordova/InAppBrowser.java
View File

@ -64,8 +64,9 @@ public class InAppBrowser extends CordovaPlugin {
private static final String SYSTEM = "_system"; private static final String SYSTEM = "_system";
private static final String BLANK = "_blank"; private static final String BLANK = "_blank";
private static final String LOCATION = "location"; private static final String LOCATION = "location";
private static int CLOSE_EVENT = 0; private static final String EXIT_EVENT = "exit";
private static int LOCATION_CHANGED_EVENT = 1; private static final String LOAD_START_EVENT = "loadstart";
private static final String LOAD_STOP_EVENT = "loadstop";
private String browserCallbackId = null; private String browserCallbackId = null;
@ -128,17 +129,16 @@ public class InAppBrowser extends CordovaPlugin {
else if (action.equals("close")) { else if (action.equals("close")) {
closeDialog(); closeDialog();
JSONObject obj = new JSONObject(); PluginResult pluginResult = new PluginResult(PluginResult.Status.OK);
obj.put("type", CLOSE_EVENT);
PluginResult pluginResult = new PluginResult(status, obj);
pluginResult.setKeepCallback(false); pluginResult.setKeepCallback(false);
this.callbackContext.sendPluginResult(pluginResult); this.callbackContext.sendPluginResult(pluginResult);
} }
else { else {
status = PluginResult.Status.INVALID_ACTION; status = PluginResult.Status.INVALID_ACTION;
} }
this.callbackContext.sendPluginResult(new PluginResult(status, result)); PluginResult pluginResult = new PluginResult(status, result);
pluginResult.setKeepCallback(true);
this.callbackContext.sendPluginResult(pluginResult);
} catch (JSONException e) { } catch (JSONException e) {
this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION)); this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
} }
@ -208,8 +208,15 @@ public class InAppBrowser extends CordovaPlugin {
* Closes the dialog * Closes the dialog
*/ */
private void closeDialog() { private void closeDialog() {
// TODO: fire 'exit' event try {
this.webView.sendJavascript("cordova.fireWindowEvent('exit');"); JSONObject obj = new JSONObject();
obj.put("type", EXIT_EVENT);
sendUpdate(obj, false);
} catch (JSONException ex) {
Log.d(LOG_TAG, "Should never happen");
}
if (dialog != null) { if (dialog != null) {
dialog.dismiss(); dialog.dismiss();
} }
@ -301,7 +308,7 @@ public class InAppBrowser extends CordovaPlugin {
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
try { try {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("type", CLOSE_EVENT); obj.put("type", EXIT_EVENT);
sendUpdate(obj, false); sendUpdate(obj, false);
} catch (JSONException e) { } catch (JSONException e) {
@ -455,11 +462,12 @@ public class InAppBrowser extends CordovaPlugin {
* @param obj a JSONObject contain event payload information * @param obj a JSONObject contain event payload information
*/ */
private void sendUpdate(JSONObject obj, boolean keepCallback) { private void sendUpdate(JSONObject obj, boolean keepCallback) {
if (this.browserCallbackId != null) { // TODO: Not sure how browserCallbackId is used overall, commenting it out for now
// if (this.browserCallbackId != null) {
PluginResult result = new PluginResult(PluginResult.Status.OK, obj); PluginResult result = new PluginResult(PluginResult.Status.OK, obj);
result.setKeepCallback(keepCallback); result.setKeepCallback(keepCallback);
this.callbackContext.sendPluginResult(result); this.callbackContext.sendPluginResult(result);
} // }
} }
/** /**
@ -500,14 +508,29 @@ public class InAppBrowser extends CordovaPlugin {
edittext.setText(newloc); edittext.setText(newloc);
} }
// TODO: Fire 'loadstart' event only on the InAppBrowser object try {
this.webView.sendJavascript("cordova.fireWindowEvent('loadstart', '" + url + "');"); JSONObject obj = new JSONObject();
obj.put("type", LOAD_START_EVENT);
obj.put("url", newloc);
sendUpdate(obj, true);
} catch (JSONException ex) {
Log.d(LOG_TAG, "Should never happen");
}
} }
public void onPageFinished(WebView view, String url) { public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url); super.onPageFinished(view, url);
// TODO: Fire 'loadstop' event only on the InAppBrowser object
this.webView.sendJavascript("cordova.fireWindowEvent('loadstop', '" + url + "');"); try {
JSONObject obj = new JSONObject();
obj.put("type", LOAD_STOP_EVENT);
obj.put("url", url);
sendUpdate(obj, true);
} catch (JSONException ex) {
Log.d(LOG_TAG, "Should never happen");
}
} }
} }
} }