Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B9E311E98 for ; Thu, 24 Apr 2014 21:09:21 +0000 (UTC) Received: (qmail 90807 invoked by uid 500); 24 Apr 2014 21:09:14 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 90790 invoked by uid 500); 24 Apr 2014 21:09:14 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 90783 invoked by uid 99); 24 Apr 2014 21:09:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2014 21:09:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AD461991E54; Thu, 24 Apr 2014 21:09:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kamrik@apache.org To: commits@cordova.apache.org Message-Id: <4626900b25014196a8029b2142e428d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Remove trailing spaces in all js files Date: Thu, 24 Apr 2014 21:09:13 +0000 (UTC) Repository: cordova-cli Updated Branches: refs/heads/master bedba7589 -> 7012448cd Remove trailing spaces in all js files So that everyone can use auto removal of trailing spaces without generating unwanted diff lines. Only white space changes, nothing else. The command used: sed -i '' 's/[[:space:]]*$//g' **/*.js Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/7012448c Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/7012448c Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/7012448c Branch: refs/heads/master Commit: 7012448cd6eb141284a186ac981d3e9d09337aba Parents: bedba75 Author: Mark Koudritsky Authored: Thu Apr 24 16:45:44 2014 -0400 Committer: Mark Koudritsky Committed: Thu Apr 24 16:45:44 2014 -0400 ---------------------------------------------------------------------- spec/xml-helpers.spec.js | 30 +++++++++++++++--------------- src/ConfigParser.js | 2 +- src/metadata/amazon_fireos_parser.js | 2 +- src/metadata/android_parser.js | 4 ++-- src/metadata/blackberry10_parser.js | 2 +- src/metadata/ios_parser.js | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/7012448c/spec/xml-helpers.spec.js ---------------------------------------------------------------------- diff --git a/spec/xml-helpers.spec.js b/spec/xml-helpers.spec.js index 9d3b3dd..6af8c4b 100644 --- a/spec/xml-helpers.spec.js +++ b/spec/xml-helpers.spec.js @@ -49,37 +49,37 @@ describe('xml-helpers', function(){ it('should return true for identical tags', function(){ expect(xml_helpers.equalNodes(usesNetworkOne, usesNetworkTwo)).toBe(true); - }); - + }); + it('should return false for different attributes', function(){ expect(xml_helpers.equalNodes(usesNetworkOne, usesReceive)).toBe(false); - }); - + }); + it('should distinguish between text', function(){ expect(xml_helpers.equalNodes(helloTagOne, goodbyeTag)).toBe(false); - }); - + }); + it('should ignore whitespace in text', function(){ expect(xml_helpers.equalNodes(helloTagOne, helloTagTwo)).toBe(true); - }); - + }); + describe('should compare children', function(){ it('by child quantity', function(){ var one = et.XML('o'), two = et.XML('o'); - - expect(xml_helpers.equalNodes(one, two)).toBe(false); + + expect(xml_helpers.equalNodes(one, two)).toBe(false); }); - + it('by child equality', function(){ var one = et.XML('o'), two = et.XML(''), uno = et.XML('\no\n'); - - expect(xml_helpers.equalNodes(one, uno)).toBe(true); - expect(xml_helpers.equalNodes(one, two)).toBe(false); + + expect(xml_helpers.equalNodes(one, uno)).toBe(true); + expect(xml_helpers.equalNodes(one, two)).toBe(false); }); - }); + }); }); describe('pruneXML', function() { var config_xml; http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/7012448c/src/ConfigParser.js ---------------------------------------------------------------------- diff --git a/src/ConfigParser.js b/src/ConfigParser.js index 3e1e57d..067c30f 100644 --- a/src/ConfigParser.js +++ b/src/ConfigParser.js @@ -127,7 +127,7 @@ ConfigParser.prototype = { // default icon if (!icon.width && !icon.height && !icon.density) { - ret.defaultIcon = icon; + ret.defaultIcon = icon; } ret.push(icon); }); http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/7012448c/src/metadata/amazon_fireos_parser.js ---------------------------------------------------------------------- diff --git a/src/metadata/amazon_fireos_parser.js b/src/metadata/amazon_fireos_parser.js index 4b727cb..f119279 100644 --- a/src/metadata/amazon_fireos_parser.js +++ b/src/metadata/amazon_fireos_parser.js @@ -61,7 +61,7 @@ module.exports.prototype = { return ret; }, - + update_from_config:function(config) { if (config instanceof ConfigParser) { } else throw new Error('update_from_config requires a ConfigParser object'); http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/7012448c/src/metadata/android_parser.js ---------------------------------------------------------------------- diff --git a/src/metadata/android_parser.js b/src/metadata/android_parser.js index 856a9cd..ef50caf 100644 --- a/src/metadata/android_parser.js +++ b/src/metadata/android_parser.js @@ -107,7 +107,7 @@ module.exports.prototype = { } if (!size && !icon.density) { if (default_icon) { - events.emit('verbose', "more than one default icon: " + JSON.stringify(icon)); + events.emit('verbose', "more than one default icon: " + JSON.stringify(icon)); } else { default_icon = icon; } @@ -145,7 +145,7 @@ module.exports.prototype = { for (var density in densities) { parseIcon(icon, size, densities[density], density); } - } + } } var copyIcon = function(density) { http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/7012448c/src/metadata/blackberry10_parser.js ---------------------------------------------------------------------- diff --git a/src/metadata/blackberry10_parser.js b/src/metadata/blackberry10_parser.js index a07e24c..ba6530f 100644 --- a/src/metadata/blackberry10_parser.js +++ b/src/metadata/blackberry10_parser.js @@ -76,7 +76,7 @@ module.exports.prototype = { var src = path.join(projectRoot, icons[i].src), dest = path.join(this.path, 'platform_www', icons[i].src), destFolder = path.join(dest, '..'); - + if (!fs.existsSync(destFolder)) { shell.mkdir(destFolder); // make sure target dir exists } http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/7012448c/src/metadata/ios_parser.js ---------------------------------------------------------------------- diff --git a/src/metadata/ios_parser.js b/src/metadata/ios_parser.js index 7f7d1a4..f906ee3 100644 --- a/src/metadata/ios_parser.js +++ b/src/metadata/ios_parser.js @@ -76,7 +76,7 @@ module.exports.prototype = { fs.writeFileSync(plistFile, info_contents, 'utf-8'); events.emit('verbose', 'Wrote out iOS Bundle Identifier to "' + pkg + '"'); events.emit('verbose', 'Wrote out iOS Bundle Version to "' + version + '"'); - + // Update icons var icons = config.getIcons('ios'); var platformRoot = this.cordovaproj;