You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/03/21 07:54:08 UTC

[1/5] git commit: Fix package name of CacheClear/plugin.xml

Repository: cordova-app-harness
Updated Branches:
  refs/heads/master 0c9986adf -> cb1e6a01b


Fix package name of CacheClear/plugin.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/df643e14
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/df643e14
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/df643e14

Branch: refs/heads/master
Commit: df643e14e6bafaad5d4b5ac57267d3ce302c9c02
Parents: 0c9986a
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Mar 20 23:15:05 2014 -0700
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Mar 20 23:15:05 2014 -0700

----------------------------------------------------------------------
 CacheClear/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/df643e14/CacheClear/plugin.xml
----------------------------------------------------------------------
diff --git a/CacheClear/plugin.xml b/CacheClear/plugin.xml
index 2792b1a..30d36b7 100644
--- a/CacheClear/plugin.xml
+++ b/CacheClear/plugin.xml
@@ -35,7 +35,7 @@
 
     <config-file target="res/xml/config.xml" parent="/*">
       <feature name="CacheClear">
-        <param name="android-package" value="org.apache.cordova.urlremap.CacheClear"/>
+        <param name="android-package" value="org.apache.cordova.cacheclear.CacheClear"/>
       </feature>
     </config-file>
   </platform>


[5/5] git commit: Remove unneccessary replace() in CrxInstaller.js

Posted by ag...@apache.org.
Remove unneccessary replace() in CrxInstaller.js


Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/cb1e6a01
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/cb1e6a01
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/cb1e6a01

Branch: refs/heads/master
Commit: cb1e6a01b2bb15d83836abe4173c6bfca92f027e
Parents: 936a83a
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Mar 20 23:52:31 2014 -0700
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Mar 20 23:52:31 2014 -0700

----------------------------------------------------------------------
 www/cdvah/js/CrxInstaller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/cb1e6a01/www/cdvah/js/CrxInstaller.js
----------------------------------------------------------------------
diff --git a/www/cdvah/js/CrxInstaller.js b/www/cdvah/js/CrxInstaller.js
index 50fdf8b..a6fdd5a 100644
--- a/www/cdvah/js/CrxInstaller.js
+++ b/www/cdvah/js/CrxInstaller.js
@@ -20,7 +20,7 @@
 
             // The filename doesn't matter, but it needs to end with .crx for the zip plugin to unpack
             // it properly. So we always set the filename to package.crx.
-            var crxFile = installPath.replace(/\/$/, '') + '/package.crx';
+            var crxFile = installPath + '/package.crx';
 
             return ResourcesLoader.downloadFromUrl(this.url, crxFile).then(function() {
                 return ResourcesLoader.extractZipFile(crxFile, installPath + '/www');


[4/5] git commit: Make resetMappings() public for use by harness-push

Posted by ag...@apache.org.
Make resetMappings() public for use by harness-push


Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/936a83a8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/936a83a8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/936a83a8

Branch: refs/heads/master
Commit: 936a83a8d3edf03a8e39009ccc9c115b0dca2a9d
Parents: 5d298ae
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Mar 20 23:52:11 2014 -0700
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Mar 20 23:52:11 2014 -0700

----------------------------------------------------------------------
 UrlRemap/src/android/UrlRemap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/936a83a8/UrlRemap/src/android/UrlRemap.java
----------------------------------------------------------------------
diff --git a/UrlRemap/src/android/UrlRemap.java b/UrlRemap/src/android/UrlRemap.java
index d12333f..8835a2e 100644
--- a/UrlRemap/src/android/UrlRemap.java
+++ b/UrlRemap/src/android/UrlRemap.java
@@ -70,7 +70,7 @@ public class UrlRemap extends CordovaPlugin {
         return true;
     }
 
-    private void resetMappings() {
+    public void resetMappings() {
         resetUrlParams = null;
         rerouteParams.clear();
     }


[3/5] git commit: Fix JS exception caused by ng promises not having a "done" method

Posted by ag...@apache.org.
Fix JS exception caused by ng promises not having a "done" method


Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/5d298ae5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/5d298ae5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/5d298ae5

Branch: refs/heads/master
Commit: 5d298ae5d68ef74891a9e1bbcc82f4b62b618724
Parents: 33e3109
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Mar 20 23:15:50 2014 -0700
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Mar 20 23:15:50 2014 -0700

----------------------------------------------------------------------
 www/cdvah/js/ListCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/5d298ae5/www/cdvah/js/ListCtrl.js
----------------------------------------------------------------------
diff --git a/www/cdvah/js/ListCtrl.js b/www/cdvah/js/ListCtrl.js
index fe6cb46..da66390 100644
--- a/www/cdvah/js/ListCtrl.js
+++ b/www/cdvah/js/ListCtrl.js
@@ -84,7 +84,7 @@
                                 return $scope.loadAppsList();
                             }).then(function() {
                                 return $scope.launchApp(theApp, { stopPropagation: function() { } });
-                            }).done(null, function(err) {
+                            }).then(null, function(err) {
                                 var msg = 'Failed to update ' + app.appId + ': ' + err;
                                 console.error(msg);
                                 notifier.error(msg);


[2/5] git commit: Don't reset plugins in UrlRemap.java

Posted by ag...@apache.org.
Don't reset plugins in UrlRemap.java


Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/33e31093
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/33e31093
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/33e31093

Branch: refs/heads/master
Commit: 33e3109315d23a927e069a9edab6824bf50da52f
Parents: df643e1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Mar 20 23:15:22 2014 -0700
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Mar 20 23:15:22 2014 -0700

----------------------------------------------------------------------
 UrlRemap/src/android/UrlRemap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/33e31093/UrlRemap/src/android/UrlRemap.java
----------------------------------------------------------------------
diff --git a/UrlRemap/src/android/UrlRemap.java b/UrlRemap/src/android/UrlRemap.java
index 28fdc1e..d12333f 100644
--- a/UrlRemap/src/android/UrlRemap.java
+++ b/UrlRemap/src/android/UrlRemap.java
@@ -99,7 +99,7 @@ public class UrlRemap extends CordovaPlugin {
                 resetMappings();
             }
 
-            webView.loadUrl(newUrl);
+            webView.loadUrlIntoView(newUrl, false);
             return true;
         }
         return false;