You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/11/28 19:16:23 UTC
[10/50] git commit: Fixes #65: whitespace elements mess up
running on ios simulator.
Fixes #65: whitespace <string> elements mess up running on ios simulator.
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/41816a6d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/41816a6d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/41816a6d
Branch: refs/heads/master
Commit: 41816a6d452dd49b282d9369dfd2e116cd9beb01
Parents: bab6419
Author: Fil Maj <ma...@gmail.com>
Authored: Tue Nov 13 11:54:55 2012 -0800
Committer: Fil Maj <ma...@gmail.com>
Committed: Tue Nov 13 11:54:55 2012 -0800
----------------------------------------------------------------------
src/metadata/ios_parser.js | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/41816a6d/src/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/ios_parser.js b/src/metadata/ios_parser.js
index e841bd6..a707844 100644
--- a/src/metadata/ios_parser.js
+++ b/src/metadata/ios_parser.js
@@ -23,7 +23,6 @@ module.exports.prototype = {
update_from_config:function(config, callback) {
if (config instanceof config_parser) {
} else throw 'update_from_config requires a config_parser object';
-
var name = config.name();
var pkg = config.packageName();
@@ -31,15 +30,17 @@ module.exports.prototype = {
var plistFile = path.join(this.cordovaproj, this.originalName + '-Info.plist');
var infoPlist = plist.parseFileSync(plistFile);
infoPlist['CFBundleIdentifier'] = pkg;
- fs.writeFileSync(plistFile, plist.build(infoPlist), 'utf-8');
-
+ var info_contents = plist.build(infoPlist);
+ info_contents = info_contents.replace(/<string>\s*<\/string>/,'<string></string>');
+ fs.writeFileSync(plistFile, info_contents, 'utf-8');
+
// Update whitelist
var cordovaPlist = path.join(this.cordovaproj, 'Cordova.plist');
var contents = plist.parseFileSync(cordovaPlist);
var whitelist = config.access.get();
contents['ExternalHosts'] = whitelist;
fs.writeFileSync(cordovaPlist, plist.build(contents), 'utf-8');
-
+
// Update product name
var proj = new xcode.project(this.pbxproj);
var parser = this;