You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dp...@apache.org on 2018/05/18 19:46:09 UTC
[cordova-common] branch master updated: CB-13979: More consistency
for config.xml lookups
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-common.git
The following commit(s) were added to refs/heads/master by this push:
new c700a5d CB-13979: More consistency for config.xml lookups
c700a5d is described below
commit c700a5d6830fe7401551c4b4ce65c1cccbb85f17
Author: Darryl Pogue <da...@dpogue.ca>
AuthorDate: Sat May 5 17:31:49 2018 -0700
CB-13979: More consistency for config.xml lookups
---
spec/fixtures/test-config.xml | 1 +
src/ConfigParser/ConfigParser.js | 14 +++++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/spec/fixtures/test-config.xml b/spec/fixtures/test-config.xml
index 5dd79e6..58928f6 100644
--- a/spec/fixtures/test-config.xml
+++ b/spec/fixtures/test-config.xml
@@ -82,6 +82,7 @@
<preference name="orientation" value="portrait" />
<icon id="icon" src="icon.png" />
<icon height="255" id="logo" src="logo.png" width="255" />
+ <platform name="android"></platform>
<platform name="android">
<icon density="mdpi" height="255" src="logo-android.png" width="255" />
<icon gap:density="mdpi" height="255" src="logo-android-gap.png" width="255" />
diff --git a/src/ConfigParser/ConfigParser.js b/src/ConfigParser/ConfigParser.js
index 4f1cc39..42f079f 100644
--- a/src/ConfigParser/ConfigParser.js
+++ b/src/ConfigParser/ConfigParser.js
@@ -161,7 +161,7 @@ ConfigParser.prototype = {
pref.attrib.value = value;
},
getPlatformPreference: function (name, platform) {
- return findElementAttributeValue(name, this.doc.findall('platform[@name=\'' + platform + '\']/preference'));
+ return findElementAttributeValue(name, this.doc.findall('./platform[@name="' + platform + '"]/preference'));
},
getPreference: function (name, platform) {
@@ -185,7 +185,7 @@ ConfigParser.prototype = {
var ret = [];
var staticResources = [];
if (platform) { // platform specific icons
- this.doc.findall('platform[@name=\'' + platform + '\']/' + resourceName).forEach(function (elt) {
+ this.doc.findall('./platform[@name="' + platform + '"]/' + resourceName).forEach(function (elt) {
elt.platform = platform; // mark as platform specific resource
staticResources.push(elt);
});
@@ -274,7 +274,7 @@ ConfigParser.prototype = {
var fileResources = [];
if (platform) { // platform specific resources
- fileResources = this.doc.findall('platform[@name=\'' + platform + '\']/resource-file').map(function (tag) {
+ fileResources = this.doc.findall('./platform[@name="' + platform + '"]/resource-file').map(function (tag) {
return {
platform: platform,
src: tag.attrib.src,
@@ -539,9 +539,7 @@ ConfigParser.prototype = {
},
/* Get all edit-config tags */
getEditConfigs: function (platform) {
- var platform_tag = this.doc.find('./platform[@name="' + platform + '"]');
- var platform_edit_configs = platform_tag ? platform_tag.findall('edit-config') : [];
-
+ var platform_edit_configs = this.doc.findall('./platform[@name="' + platform + '"]/edit-config');
var edit_configs = this.doc.findall('edit-config').concat(platform_edit_configs);
return edit_configs.map(function (tag) {
@@ -559,9 +557,7 @@ ConfigParser.prototype = {
/* Get all config-file tags */
getConfigFiles: function (platform) {
- var platform_tag = this.doc.find('./platform[@name="' + platform + '"]');
- var platform_config_files = platform_tag ? platform_tag.findall('config-file') : [];
-
+ var platform_config_files = this.doc.findall('./platform[@name="' + platform + '"]/config-file');
var config_files = this.doc.findall('config-file').concat(platform_config_files);
return config_files.map(function (tag) {
--
To stop receiving notification emails like this one, please contact
dpogue@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org