You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2015/09/19 00:30:08 UTC
[1/3] cordova-lib git commit: CB-9407 Fixes incorrect applying of
plugin-provided config changes.
Repository: cordova-lib
Updated Branches:
refs/heads/master a3b1fcadb -> 436679fd7
CB-9407 Fixes incorrect applying of plugin-provided config changes.
This resolves #274
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/fee3466f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/fee3466f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/fee3466f
Branch: refs/heads/master
Commit: fee3466f41a66be0a1578b28a46746e5735ae44e
Parents: 74a3432
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Mon Sep 7 13:01:22 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Mon Sep 7 16:28:40 2015 +0300
----------------------------------------------------------------------
cordova-lib/src/platforms/PlatformApiPoly.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/fee3466f/cordova-lib/src/platforms/PlatformApiPoly.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/platforms/PlatformApiPoly.js b/cordova-lib/src/platforms/PlatformApiPoly.js
index 70869d8..d8abf19 100644
--- a/cordova-lib/src/platforms/PlatformApiPoly.js
+++ b/cordova-lib/src/platforms/PlatformApiPoly.js
@@ -196,8 +196,9 @@ PlatformApiPoly.prototype.prepare = function (cordovaProject) {
shell.cp('-f', sourceCfg.path, ownConfig);
}
- this._config = new ConfigParser(ownConfig);
+ this._munger.reapply_global_munge().save_all();
+ this._config = new ConfigParser(ownConfig);
xmlHelpers.mergeXml(cordovaProject.projectConfig.doc.getroot(),
this._config.doc.getroot(), this.platform, true);
// CB-6976 Windows Universal Apps. For smooth transition and to prevent mass api failures
@@ -211,10 +212,8 @@ PlatformApiPoly.prototype.prepare = function (cordovaProject) {
// Update own www dir with project's www assets and plugins' assets and js-files
this._parser.update_www(cordovaProject.locations.www);
- this._munger.reapply_global_munge().save_all();
-
// update project according to config.xml changes.
- return this._parser.update_project(cordovaProject.projectConfig);
+ return this._parser.update_project(this._config);
};
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] cordova-lib git commit: Merge branch 'CB-9407'
Posted by za...@apache.org.
Merge branch 'CB-9407'
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/436679fd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/436679fd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/436679fd
Branch: refs/heads/master
Commit: 436679fd71e887577ae9fea00ab385f421d846bf
Parents: a3b1fca 31d1d34
Author: Piotr Zalewa <pi...@zalewa.info>
Authored: Sat Sep 19 00:29:20 2015 +0200
Committer: Piotr Zalewa <pi...@zalewa.info>
Committed: Sat Sep 19 00:29:20 2015 +0200
----------------------------------------------------------------------
cordova-lib/src/platforms/PlatformApiPoly.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] cordova-lib git commit: Merge branch 'CB-9407' of
github.com:MSOpenTech/cordova-lib into CB-9407
Posted by za...@apache.org.
Merge branch 'CB-9407' of github.com:MSOpenTech/cordova-lib into CB-9407
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/31d1d344
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/31d1d344
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/31d1d344
Branch: refs/heads/master
Commit: 31d1d3447d41d1f910ae0ba4ad07e6c3effe3afb
Parents: a3b1fca fee3466
Author: Piotr Zalewa <pi...@zalewa.info>
Authored: Fri Sep 18 19:42:21 2015 +0200
Committer: Piotr Zalewa <pi...@zalewa.info>
Committed: Fri Sep 18 19:42:21 2015 +0200
----------------------------------------------------------------------
cordova-lib/src/platforms/PlatformApiPoly.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/31d1d344/cordova-lib/src/platforms/PlatformApiPoly.js
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org