You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/10/07 20:17:40 UTC
git commit: CB-4731 Avoid duplicates when merging arrays in .plist
files
Repository: cordova-lib
Updated Branches:
refs/heads/master 6096b9908 -> 5a7376d7b
CB-4731 Avoid duplicates when merging arrays in .plist files
github: close #91
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/5a7376d7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/5a7376d7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/5a7376d7
Branch: refs/heads/master
Commit: 5a7376d7b11c6bd2309623f157494d750d221ca6
Parents: 6096b99
Author: Gorkem Ercan <go...@gmail.com>
Authored: Wed Sep 24 14:01:53 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Oct 7 14:17:32 2014 -0400
----------------------------------------------------------------------
cordova-lib/src/plugman/util/config-changes.js | 2 +-
cordova-lib/src/plugman/util/plist-helpers.js | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5a7376d7/cordova-lib/src/plugman/util/config-changes.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/config-changes.js b/cordova-lib/src/plugman/util/config-changes.js
index 0fd5763..daee709 100644
--- a/cordova-lib/src/plugman/util/config-changes.js
+++ b/cordova-lib/src/plugman/util/config-changes.js
@@ -678,7 +678,7 @@ function resolveConfigFilePath(project_dir, platform, file) {
if (matches.length) filepath = matches[0];
// [CB-5989] multiple Info.plist files may exist. default to $PROJECT_NAME-Info.plist
- if(matches.length > 1 && file.indexOf("-Info.plist")>-1){
+ if(matches.length > 1 && file.indexOf('-Info.plist')>-1){
var plistName = getIOSProjectname(project_dir)+'-Info.plist';
for (var i=0; i < matches.length; i++) {
if(matches[i].indexOf(plistName) > -1){
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5a7376d7/cordova-lib/src/plugman/util/plist-helpers.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/plist-helpers.js b/cordova-lib/src/plugman/util/plist-helpers.js
index 605a6c2..37492db 100644
--- a/cordova-lib/src/plugman/util/plist-helpers.js
+++ b/cordova-lib/src/plugman/util/plist-helpers.js
@@ -31,8 +31,16 @@ function graftPLIST(doc, xml, selector) {
var obj = plist.parse('<plist>'+xml+'</plist>');
var node = doc[selector];
- if (node && Array.isArray(node) && Array.isArray(obj))
- doc[selector] = node.concat(obj);
+ if (node && Array.isArray(node) && Array.isArray(obj)){
+ node.concat(obj);
+ for(var i =0;i<node.length; i++){
+ for(var j=i+1; j<node.length; ++j) {
+ if(node[i] === node[j])
+ node.splice(j--,1);
+ }
+ }
+ doc[selector] = node;
+ }
else
doc[selector] = obj;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org