cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kam...@apache.org
Subject git commit: Look at the old uri in config.json in addition to the new url (i vs. l).
Date Fri, 04 Jul 2014 16:45:36 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 151a14ab1 -> 88d51bd8b


Look at the old uri in config.json in addition to the new url (i vs. l).

For backwards compatibility. In case someone has scripts tat pass extra JSON
config to cordova 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/88d51bd8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/88d51bd8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/88d51bd8

Branch: refs/heads/master
Commit: 88d51bd8b86bc3263367732ced7a3d0ad66e4cdc
Parents: 151a14a
Author: Mark Koudritsky <kamrik@gmail.com>
Authored: Fri Jul 4 12:42:47 2014 -0400
Committer: Mark Koudritsky <kamrik@gmail.com>
Committed: Fri Jul 4 12:42:47 2014 -0400

----------------------------------------------------------------------
 cordova-lib/src/cordova/create.js | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/88d51bd8/cordova-lib/src/cordova/create.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/create.js b/cordova-lib/src/cordova/create.js
index d086fc3..bd0cab1 100644
--- a/cordova-lib/src/cordova/create.js
+++ b/cordova-lib/src/cordova/create.js
@@ -97,6 +97,8 @@ function create(dir, id, name, cfg) {
     var custom_hooks;
 
     if (config_json.lib && config_json.lib.www) {
+        // This was changed from "uri" to "url", but checking uri for backwards compatibility.
+        config_json.lib.www.url = config_json.lib.www.url || config_json.lib.www.uri;
         events.emit('log', 'Using custom www assets from '+config_json.lib.www.url);
         // TODO (kamrik): extend lazy_load for retrieval without caching to allow net urls
for --src.
         config_json.lib.www.version = config_json.lib.www.version || 'not_versioned';


Mime
View raw message