You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by js...@apache.org on 2014/07/03 00:06:21 UTC
[1/3] git commit: CB-7065 lazy_load: do not append tgz for non urls
Repository: cordova-lib
Updated Branches:
refs/heads/master 3a84379f4 -> 07ad20633
CB-7065 lazy_load: do not append tgz for non urls
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/7b5dee59
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/7b5dee59
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/7b5dee59
Branch: refs/heads/master
Commit: 7b5dee59505b036b1846b3573b0fe4ef3e9ffabf
Parents: 3a84379
Author: Josh Soref <js...@blackberry.com>
Authored: Wed Jul 2 17:44:33 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Wed Jul 2 18:05:29 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/lazy_load.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7b5dee59/cordova-lib/src/cordova/lazy_load.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js
index 690d8f4..d423645 100644
--- a/cordova-lib/src/cordova/lazy_load.js
+++ b/cordova-lib/src/cordova/lazy_load.js
@@ -86,7 +86,9 @@ function cordova_git(platform) {
return Q.reject(new Error('Cordova library "' + platform + '" not recognized.'));
}
plat = mixed_platforms[platform];
- plat.url = plat.url + ';a=snapshot;h=' + plat.version + ';sf=tgz';
+ if (/^...*:/.test(plat.url)) {
+ plat.url = plat.url + ';a=snapshot;h=' + plat.version + ';sf=tgz';
+ }
plat.id = 'cordova';
return module.exports.custom(mixed_platforms, platform);
}
[2/3] git commit: CB-6776 (avoid stomping on global platforms
properties)
Posted by js...@apache.org.
CB-6776 (avoid stomping on global platforms properties)
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/8ec83be0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/8ec83be0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/8ec83be0
Branch: refs/heads/master
Commit: 8ec83be0b3120617e65ab3a817e074ab7a5ae022
Parents: 7b5dee5
Author: Josh Soref <js...@blackberry.com>
Authored: Wed Jul 2 17:49:47 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Wed Jul 2 18:05:32 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/lazy_load.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/8ec83be0/cordova-lib/src/cordova/lazy_load.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js
index d423645..b1b30d2 100644
--- a/cordova-lib/src/cordova/lazy_load.js
+++ b/cordova-lib/src/cordova/lazy_load.js
@@ -62,7 +62,7 @@ function based_on_config(project_root, platform, opts) {
if (custom_path) {
var dot_file = config.read(project_root),
mixed_platforms = _.extend({}, platforms);
- mixed_platforms[platform] = _.extend(mixed_platforms[platform] || {}, dot_file.lib && dot_file.lib[platform] || {});
+ mixed_platforms[platform] = _.extend({}, mixed_platforms[platform], dot_file.lib && dot_file.lib[platform] || {});
return module.exports.custom(mixed_platforms, platform);
} else {
return module.exports.cordova(platform, opts);
[3/3] git commit: CB-6776 (correct windows8 fallback path)
Posted by js...@apache.org.
CB-6776 (correct windows8 fallback path)
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/07ad2063
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/07ad2063
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/07ad2063
Branch: refs/heads/master
Commit: 07ad206336ac1fa93d47aeea545e2795e477d865
Parents: 8ec83be
Author: Josh Soref <js...@blackberry.com>
Authored: Wed Jul 2 18:03:02 2014 -0400
Committer: Josh Soref <js...@blackberry.com>
Committed: Wed Jul 2 18:05:32 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/cordova/lazy_load.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/07ad2063/cordova-lib/src/cordova/lazy_load.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js
index b1b30d2..2f67711 100644
--- a/cordova-lib/src/cordova/lazy_load.js
+++ b/cordova-lib/src/cordova/lazy_load.js
@@ -56,7 +56,7 @@ exports.based_on_config = based_on_config;
// Returns a promise for the path to the lazy-loaded directory.
function based_on_config(project_root, platform, opts) {
var custom_path = config.has_custom_path(project_root, platform);
- if (custom_path === undefined && platform === 'windows') {
+ if (custom_path === false && platform === 'windows') {
custom_path = config.has_custom_path(project_root, 'windows8');
}
if (custom_path) {