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/05/27 03:57:22 UTC

git commit: Remove use of file-system-roots plugin (functionality now built into file plugin)

Repository: cordova-app-harness
Updated Branches:
  refs/heads/master a8c23d632 -> 56e494c2a


Remove use of file-system-roots plugin (functionality now built into file plugin)


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/56e494c2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/56e494c2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/56e494c2

Branch: refs/heads/master
Commit: 56e494c2ade8b231d04c62059fc3da148bf1aece
Parents: a8c23d6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon May 26 21:56:11 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon May 26 21:57:00 2014 -0400

----------------------------------------------------------------------
 createproject.sh    |  1 -
 www/cdvah/js/app.js | 14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/56e494c2/createproject.sh
----------------------------------------------------------------------
diff --git a/createproject.sh b/createproject.sh
index 7e751d4..394808b 100755
--- a/createproject.sh
+++ b/createproject.sh
@@ -79,7 +79,6 @@ echo Installing plugins.
     org.apache.cordova.device \
     org.chromium.socket \
     org.chromium.zip \
-    org.apache.cordova.file-system-roots \
     --searchpath="$PLUGIN_SEARCH_PATH"
 # org.apache.cordova.device isn't used directly, but is convenient to test mobilespec.
 

http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/56e494c2/www/cdvah/js/app.js
----------------------------------------------------------------------
diff --git a/www/cdvah/js/app.js b/www/cdvah/js/app.js
index 5cb924e..b111394 100644
--- a/www/cdvah/js/app.js
+++ b/www/cdvah/js/app.js
@@ -44,14 +44,8 @@ myApp.factory('urlCleanup', function() {
 });
 
 document.addEventListener('deviceready', function() {
-    cordova.filesystem.getDataDirectory(false, function(dirEntry) {
-        myApp.value('INSTALL_DIRECTORY', dirEntry.toURL() + 'apps/');
-        myApp.value('APPS_JSON', dirEntry.toURL() + 'apps.json');
-        window.requestFileSystem(window.TEMPORARY, 1 * 1024 * 1024, function(fs) {
-            myApp.value('TEMP_DIR', fs.root.toURL());
-            angular.bootstrap(document, ['CordovaAppHarness']);
-        }, function() {
-            console.error('Failed to get temporary FS');
-        });
-    });
+    myApp.value('INSTALL_DIRECTORY', cordova.file.dataDirectory + 'apps/');
+    myApp.value('APPS_JSON', cordova.file.dataDirectory + 'apps.json');
+    myApp.value('TEMP_DIR', cordova.file.tempDirectory || cordova.file.cacheDirectory);
+    angular.bootstrap(document, ['CordovaAppHarness']);
 }, false);