cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kam...@apache.org
Subject git commit: CB-6776: Fix uri/url renaming bug
Date Mon, 07 Jul 2014 21:41:51 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master ea44fe9de -> 23f7a6206


CB-6776: Fix uri/url renaming bug

Another backward compatibility issue with tools that provide custom
url for platform files as part of extra config passed to create.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/23f7a620
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/23f7a620
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/23f7a620

Branch: refs/heads/master
Commit: 23f7a62060fc82dc7740370c78c9407df52ef734
Parents: ea44fe9
Author: Mark Koudritsky <kamrik@gmail.com>
Authored: Mon Jul 7 17:39:39 2014 -0400
Committer: Mark Koudritsky <kamrik@gmail.com>
Committed: Mon Jul 7 17:39:39 2014 -0400

----------------------------------------------------------------------
 cordova-lib/src/cordova/lazy_load.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/23f7a620/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 2f67711..b1f3312 100644
--- a/cordova-lib/src/cordova/lazy_load.js
+++ b/cordova-lib/src/cordova/lazy_load.js
@@ -136,7 +136,10 @@ function custom(platforms, platform) {
 
     plat = _.extend({}, stubplatform, platforms[platform]);
     version = plat.version;
-    url = plat.url;
+    // Older tools can still provide uri (as opposed to url) as part of extra
+    // cofnig to create, it should override the default url provided in
+    // platfroms.js
+    url = plat.uri || plat.url;
     id = plat.id;
     subdir = plat.subdirectory;
     platdir = plat.altplatform || platform;


Mime
View raw message