cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cordova-lib git commit: CB-11777: Restore plugins before preparing
Date Wed, 19 Apr 2017 19:08:27 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 6f0a5611a -> 036904536


CB-11777: Restore plugins before preparing

 This closes #487


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

Branch: refs/heads/master
Commit: 036904536ca71189e1bd0d8c424f87c9f0a41cc4
Parents: 6f0a561
Author: Darryl Pogue <darryl@ayogo.com>
Authored: Fri Aug 26 15:10:52 2016 -0700
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Wed Apr 19 12:03:08 2017 -0700

----------------------------------------------------------------------
 cordova-lib/src/cordova/prepare.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/03690453/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index 9a5cdab..729813d 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -53,6 +53,9 @@ function prepare(options) {
                 return platforms.getPlatformApi(p, platform_path).getPlatformInfo().locations.www;
             });
             options.paths = paths;
+        }).then(function () {
+            options = cordova_util.preProcessOptions(options);
+            return restore.installPluginsFromConfigXML(options);
         }).then(function() {
             options = cordova_util.preProcessOptions(options);
             options.searchpath = options.searchpath || config_json.plugin_search_path;
@@ -63,8 +66,6 @@ function prepare(options) {
                 return platforms.getPlatformApi(platform).getPlatformInfo().locations.www;
             });
             return hooksRunner.fire('after_prepare', options);
-        }).then(function () {
-            return restore.installPluginsFromConfigXML(options);
         });
     });
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message