You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/01/11 00:09:59 UTC
android commit: Fixed broken functions that were deprecated
Updated Branches:
refs/heads/master 25aef945d -> 1f3938661
Fixed broken functions that were deprecated
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/1f393866
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1f393866
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1f393866
Branch: refs/heads/master
Commit: 1f393866166387bcf3ea1a0f3c943a6712da1822
Parents: 25aef94
Author: Benn Mapes <be...@gmail.com>
Authored: Thu Jan 10 15:07:26 2013 -0800
Committer: Benn Mapes <be...@gmail.com>
Committed: Thu Jan 10 15:07:26 2013 -0800
----------------------------------------------------------------------
framework/src/org/apache/cordova/App.java | 10 +---------
.../src/org/apache/cordova/api/LegacyContext.java | 3 +--
2 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1f393866/framework/src/org/apache/cordova/App.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java
index dad34a0..afdbf3f 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@ -64,7 +64,7 @@ public class App extends CordovaPlugin {
this.loadUrl(args.getString(0), args.optJSONObject(1));
}
else if (action.equals("cancelLoadUrl")) {
- this.cancelLoadUrl();
+ //this.cancelLoadUrl();
}
else if (action.equals("clearHistory")) {
this.clearHistory();
@@ -161,14 +161,6 @@ public class App extends CordovaPlugin {
}
/**
- * Cancel loadUrl before it has been loaded (Only works on a CordovaInterface class)
- */
- @Deprecated
- public void cancelLoadUrl() {
- this.cordova.cancelLoadUrl();
- }
-
- /**
* Clear page history for the app.
*/
public void clearHistory() {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1f393866/framework/src/org/apache/cordova/api/LegacyContext.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/api/LegacyContext.java b/framework/src/org/apache/cordova/api/LegacyContext.java
index c303038..fe154f7 100644
--- a/framework/src/org/apache/cordova/api/LegacyContext.java
+++ b/framework/src/org/apache/cordova/api/LegacyContext.java
@@ -43,7 +43,6 @@ public class LegacyContext implements CordovaInterface {
@Deprecated
public void cancelLoadUrl() {
Log.i(LOG_TAG, "Replace ctx.cancelLoadUrl() with cordova.cancelLoadUrl()");
- this.cordova.cancelLoadUrl();
}
@Deprecated
@@ -55,7 +54,7 @@ public class LegacyContext implements CordovaInterface {
@Deprecated
public Context getContext() {
Log.i(LOG_TAG, "Replace ctx.getContext() with cordova.getContext()");
- return this.cordova.getContext();
+ return this.cordova.getActivity();
}
@Deprecated