You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2015/09/01 13:56:35 UTC
cordova-lib git commit: CB-9354 Fix array merging with complex items
Repository: cordova-lib
Updated Branches:
refs/heads/master 41765f1fd -> b0c196510
CB-9354 Fix array merging with complex items
This closes #256
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b0c19651
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b0c19651
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b0c19651
Branch: refs/heads/master
Commit: b0c196510aa73b3ef0752c78f06e2a99afe04a95
Parents: 41765f1
Author: Svyatoslav Grebenchukov <m1...@gmail.com>
Authored: Mon Aug 31 19:30:27 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Sep 1 14:57:00 2015 +0300
----------------------------------------------------------------------
cordova-lib/spec-plugman/plugins/org.apache.plist/plugin.xml | 4 ++++
.../projects/ios-config-xml/SampleApp/SampleApp-Info.plist | 8 ++++++--
cordova-lib/spec-plugman/util/config-changes.spec.js | 1 +
cordova-lib/src/plugman/util/plist-helpers.js | 2 +-
4 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b0c19651/cordova-lib/spec-plugman/plugins/org.apache.plist/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/plugins/org.apache.plist/plugin.xml b/cordova-lib/spec-plugman/plugins/org.apache.plist/plugin.xml
index b7d5439..d7ef35d 100644
--- a/cordova-lib/spec-plugman/plugins/org.apache.plist/plugin.xml
+++ b/cordova-lib/spec-plugman/plugins/org.apache.plist/plugin.xml
@@ -48,6 +48,10 @@
<array>
<string>schema-a</string>
<string>schema-b</string>
+ <dict>
+ <key>SchemaName</key>
+ <string>schema-c</string>
+ </dict>
</array>
</config-file>
</platform>
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b0c19651/cordova-lib/spec-plugman/projects/ios-config-xml/SampleApp/SampleApp-Info.plist
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/projects/ios-config-xml/SampleApp/SampleApp-Info.plist b/cordova-lib/spec-plugman/projects/ios-config-xml/SampleApp/SampleApp-Info.plist
index 1edf010..5afd655 100644
--- a/cordova-lib/spec-plugman/projects/ios-config-xml/SampleApp/SampleApp-Info.plist
+++ b/cordova-lib/spec-plugman/projects/ios-config-xml/SampleApp/SampleApp-Info.plist
@@ -9,9 +9,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -51,6 +51,10 @@
<key>CFValidSchemas</key>
<array>
<string>schema-a</string>
+ <dict>
+ <key>SchemaName</key>
+ <string>schema-c</string>
+ </dict>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b0c19651/cordova-lib/spec-plugman/util/config-changes.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/util/config-changes.spec.js b/cordova-lib/spec-plugman/util/config-changes.spec.js
index 136f51f..09bd350 100644
--- a/cordova-lib/spec-plugman/util/config-changes.spec.js
+++ b/cordova-lib/spec-plugman/util/config-changes.spec.js
@@ -320,6 +320,7 @@ describe('config-changes module', function() {
expect(fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8')).toMatch(/<key>UINewsstandIcon<\/key>[\s\S]*<key>CFBundlePrimaryIcon<\/key>/);
expect(fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8')).toMatch(/<string>schema-b<\/string>/);
expect(fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8')).not.toMatch(/(<string>schema-a<\/string>[^]*){2,}/);
+ expect(fs.readFileSync(path.join(temp, 'SampleApp', 'SampleApp-Info.plist'), 'utf-8')).not.toMatch(/(<string>schema-c<\/string>[^]*){2,}/);
});
});
describe('of pbxproject framework files', function() {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b0c19651/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 8278e9f..9dee5c6 100644
--- a/cordova-lib/src/plugman/util/plist-helpers.js
+++ b/cordova-lib/src/plugman/util/plist-helpers.js
@@ -31,7 +31,7 @@ function graftPLIST(doc, xml, selector) {
node = 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])
+ if (nodeEqual(node[i], node[j]))
node.splice(j--,1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org