You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2013/05/13 16:35:38 UTC
git commit: [CB-3307] Updating to work with recent changes to
cordova.js naming
Updated Branches:
refs/heads/future 6ad6a2652 -> 534448e27
[CB-3307] Updating to work with recent changes to cordova.js naming
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/534448e2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/534448e2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/534448e2
Branch: refs/heads/future
Commit: 534448e27f5916030605d207859b69e5cf175d6c
Parents: 6ad6a26
Author: Michal Mocny <mm...@gmail.com>
Authored: Sun May 12 21:35:02 2013 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Mon May 13 10:34:10 2013 -0400
----------------------------------------------------------------------
src/metadata/android_parser.js | 2 +-
src/metadata/ios_parser.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/534448e2/src/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/android_parser.js b/src/metadata/android_parser.js
index 79c1f2b..d732a04 100644
--- a/src/metadata/android_parser.js
+++ b/src/metadata/android_parser.js
@@ -144,7 +144,7 @@ module.exports.prototype = {
shell.cp('-rf', www, platformWww);
// write out android lib's cordova.js
- var jsPath = path.join(util.libDirectory, 'cordova-android', 'framework', 'assets', 'js', 'cordova.android.js');
+ var jsPath = path.join(util.libDirectory, 'cordova-android', 'framework', 'assets', 'www', 'cordova.js');
fs.writeFileSync(path.join(this.www_dir(), 'cordova.js'), fs.readFileSync(jsPath, 'utf-8'), 'utf-8');
},
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/534448e2/src/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/ios_parser.js b/src/metadata/ios_parser.js
index 5c22256..4f15a59 100644
--- a/src/metadata/ios_parser.js
+++ b/src/metadata/ios_parser.js
@@ -158,7 +158,7 @@ module.exports.prototype = {
shell.cp('-rf', www, this.path);
// write out proper cordova.js
- shell.cp('-f', path.join(util.libDirectory, 'cordova-ios', 'CordovaLib', 'cordova.ios.js'), path.join(project_www, 'cordova.js'));
+ shell.cp('-f', path.join(util.libDirectory, 'cordova-ios', 'CordovaLib', 'cordova.js'), path.join(project_www, 'cordova.js'));
},