You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2014/08/27 13:40:12 UTC
[1/2] git commit: Remove use of path.join for manifest.launch_path
Repository: cordova-lib
Updated Branches:
refs/heads/master ed6c0a183 -> ab7090595
Remove use of path.join for manifest.launch_path
I was having issues on Windows when creating a new FirefoxOS project. A brand new project, when added to the Firefox App Manager, gave an error: "Launch path has to be an absolute path starting with '/': '\index.html'". The issue is the use of path.join to generate manifest.launch_path. On Windows, this uses backslashes, which caused the issue. I have opted to simply use concatenation instead.
I have also fixed an issue where "cordova prepare firefoxos" would fail if there was no <content> tag in the config.xml. If it is not present, we default to index.html.
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d79f0c16
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d79f0c16
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d79f0c16
Branch: refs/heads/master
Commit: d79f0c16e89a77e682b750e10c195e45bf1430c2
Parents: ed6c0a1
Author: Menardi <he...@gearoid.me>
Authored: Fri Aug 22 22:35:13 2014 +0100
Committer: Menardi <he...@gearoid.me>
Committed: Fri Aug 22 22:35:13 2014 +0100
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/firefoxos_parser.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d79f0c16/cordova-lib/src/cordova/metadata/firefoxos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/firefoxos_parser.js b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
index e3f4818..b4e435e 100644
--- a/cordova-lib/src/cordova/metadata/firefoxos_parser.js
+++ b/cordova-lib/src/cordova/metadata/firefoxos_parser.js
@@ -49,8 +49,8 @@ module.exports.prototype = {
// overwrite properties existing in config.xml
var contentNode = config.doc.find('content');
- var contentSrc = contentNode.attrib['src'];
- manifest.launch_path = path.join('/', contentSrc) || '/index.html';
+ var contentSrc = contentNode && contentNode.attrib['src'] || 'index.html';
+ manifest.launch_path = '/' + contentSrc;
manifest.installs_allowed_from = manifest.installs_allowed_from || ['*'];
manifest.version = config.version();
[2/2] git commit: Merge remote-tracking branch 'Menardi/patch-1'
Posted by za...@apache.org.
Merge remote-tracking branch 'Menardi/patch-1'
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/ab709059
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/ab709059
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/ab709059
Branch: refs/heads/master
Commit: ab70905954addefb580dae7101eaefd9f5a4101f
Parents: ed6c0a1 d79f0c1
Author: Piotr Zalewa <pi...@zalewa.info>
Authored: Wed Aug 27 13:39:52 2014 +0200
Committer: Piotr Zalewa <pi...@zalewa.info>
Committed: Wed Aug 27 13:39:52 2014 +0200
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/firefoxos_parser.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------