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:22 UTC
[2/3] git commit: CB-6776 (avoid stomping on global platforms
properties)
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);