incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [47/50] [abbrv] android commit: Merge branch 'CordovaWebView' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView
Date Thu, 07 Jun 2012 20:20:55 GMT
Merge branch 'CordovaWebView' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
into CordovaWebView

Conflicts:
	framework/src/org/apache/cordova/FileUtils.java
	framework/src/org/apache/cordova/GeoListener.java
	framework/src/org/apache/cordova/GpsListener.java
	framework/src/org/apache/cordova/NetworkListener.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/d44d9ddc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/d44d9ddc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/d44d9ddc

Branch: refs/heads/master
Commit: d44d9ddca657dbed92681a457db8959d4d079c27
Parents: 13f92b2 dd0b6b1
Author: Bryce Curtis <curtis.bryce@gmail.com>
Authored: Mon May 14 23:16:32 2012 -0500
Committer: Bryce Curtis <curtis.bryce@gmail.com>
Committed: Mon May 14 23:16:32 2012 -0500

----------------------------------------------------------------------
 .gitignore                                         |    1 +
 README.md                                          |    1 +
 bin/package.json                                   |   19 --
 framework/assets/js/cordova.android.js             |   33 +--
 framework/project.properties                       |    2 +-
 .../apache/cordova/CordovaLocationListener.java    |  198 ++++++++++++
 framework/src/org/apache/cordova/DroidGap.java     |    4 +-
 framework/src/org/apache/cordova/GPSListener.java  |   50 +++
 framework/src/org/apache/cordova/GeoBroker.java    |  251 ++++++++-------
 framework/src/org/apache/cordova/GeoListener.java  |  134 --------
 .../org/apache/cordova/test/BackButtonTest.java    |   49 +++
 .../apache/cordova/test/CordovaActivityTest.java   |    3 +-
 test/src/org/apache/cordova/test/ErrorUrlTest.java |   35 ++
 .../org/apache/cordova/test/HtmlNotFoundTest.java  |   11 +
 test/src/org/apache/cordova/test/IFrameTest.java   |   11 +
 test/src/org/apache/cordova/test/JQMTabTest.java   |   12 +
 .../src/org/apache/cordova/test/LifecycleTest.java |   11 +
 .../org/apache/cordova/test/LoadTimeoutTest.java   |   10 +
 .../org/apache/cordova/test/SplashscreenTest.java  |   12 +
 .../org/apache/cordova/test/UserWebViewTest.java   |   11 +
 .../src/org/apache/cordova/test/WhitelistTest.java |   12 +
 test/src/org/apache/cordova/test/XhrTest.java      |   11 +
 test/src/org/apache/cordova/test/errorurl.java     |    2 +
 23 files changed, 590 insertions(+), 293 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d44d9ddc/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/DroidGap.java
index bccc821,9aa3a46..21164e3
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@@ -585,13 -659,11 +585,13 @@@ public class DroidGap extends Activity 
          }
  
          // Send pause event to JavaScript
-         this.appView.loadUrl("javascript:try{cordova.require('cordova/channel').onPause.fire();}catch(e){console.log('exception
firing pause event from native');};");
+         this.appView.loadUrl("javascript:try{cordova.fireDocumentEvent('pause');}catch(e){console.log('exception
firing pause event from native');};");
  
          // Forward to plugins
 -        appView.pluginManager.onPause(this.keepRunning);
 -        
 +        if (this.appView.pluginManager != null) {
 +            this.appView.pluginManager.onPause(this.keepRunning);
 +        }
 +
          // If app doesn't want to run in background
          if (!this.keepRunning) {
  
@@@ -630,13 -700,11 +630,13 @@@
          }
  
          // Send resume event to JavaScript
-         this.appView.loadUrl("javascript:try{cordova.require('cordova/channel').onResume.fire();}catch(e){console.log('exception
firing resume event from native');};");
+         this.appView.loadUrl("javascript:try{cordova.fireDocumentEvent('resume');}catch(e){console.log('exception
firing resume event from native');};");
  
          // Forward to plugins
 -        appView.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
 -        
 +        if (this.appView.pluginManager != null) {
 +            this.appView.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
 +        }
 +
          // If app doesn't want to run in background
          if (!this.keepRunning || this.activityResultKeepRunning) {
  


Mime
View raw message