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/06/20 19:38:22 UTC
git commit: Renaming cordova_plugins.js caused a race condition. Fix
it by editing cordova.js
Repository: cordova-app-harness
Updated Branches:
refs/heads/master 6362305fa -> eed438dbe
Renaming cordova_plugins.js caused a race condition. Fix it by editing cordova.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/eed438db
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/eed438db
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/eed438db
Branch: refs/heads/master
Commit: eed438dbea1565bf112087ea0c36b5d6be6b1e6e
Parents: 6362305
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jun 20 13:37:48 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jun 20 13:37:48 2014 -0400
----------------------------------------------------------------------
template-overrides/after-hook.js | 3 +++
www/cdvah/harnessmenu.html | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/eed438db/template-overrides/after-hook.js
----------------------------------------------------------------------
diff --git a/template-overrides/after-hook.js b/template-overrides/after-hook.js
index fb6bc52..c052ffa 100755
--- a/template-overrides/after-hook.js
+++ b/template-overrides/after-hook.js
@@ -72,6 +72,9 @@ function renameCordovaPluginsFile() {
platforms.forEach(function(platformId) {
var wwwPath = preparedWwwPathMap[platformId];
fs.renameSync(path.join(wwwPath, 'cordova_plugins.js'), path.join(wwwPath, 'cordova_plugins_harness.js'));
+ var cordovaJsContents = fs.readFileSync(path.join(wwwPath, 'cordova.js'), 'utf8');
+ cordovaJsContents = cordovaJsContents.replace(/cordova_plugins\.js/g, 'cordova_plugins_harness.js');
+ fs.writeFileSync(path.join(wwwPath, 'cordova.js'), cordovaJsContents);
console.log('Renamed cordova_plugins.js -> ' + path.join(wwwPath, 'cordova_plugins_harness.js'));
});
}
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/eed438db/www/cdvah/harnessmenu.html
----------------------------------------------------------------------
diff --git a/www/cdvah/harnessmenu.html b/www/cdvah/harnessmenu.html
index c4a2598..8fcc9a3 100644
--- a/www/cdvah/harnessmenu.html
+++ b/www/cdvah/harnessmenu.html
@@ -21,7 +21,6 @@
<head>
<title>Cordova App Harness</title>
<script type="text/javascript" src="../cordova.js"></script>
- <script type="text/javascript" src="../cordova_plugins_harness.js"></script>
<script type="text/javascript" src="js/libs/angular.js"></script>
<script type="text/javascript" src="js/libs/angular-route.js"></script>
<script type="text/javascript" src="js/libs/moment.min.js"></script>