Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D0576200B80 for ; Wed, 10 Aug 2016 01:27:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CF194160AAD; Tue, 9 Aug 2016 23:27:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2BEAE160AA5 for ; Wed, 10 Aug 2016 01:27:40 +0200 (CEST) Received: (qmail 71377 invoked by uid 500); 9 Aug 2016 23:27:34 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 71035 invoked by uid 99); 9 Aug 2016 23:27:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2016 23:27:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DAE84EEE1E; Tue, 9 Aug 2016 23:27:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Tue, 09 Aug 2016 23:27:40 -0000 Message-Id: In-Reply-To: <4916f27bc982496496597f7334b43e76@git.apache.org> References: <4916f27bc982496496597f7334b43e76@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/19] cordova-lib git commit: CB-11645 added check to see if getEditConfig exists before trying to use it archived-at: Tue, 09 Aug 2016 23:27:41 -0000 CB-11645 added check to see if getEditConfig exists before trying to use it Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/185a2424 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/185a2424 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/185a2424 Branch: refs/heads/common-1.4.x Commit: 185a2424eb31a088c8cbc06e3231893e0a85a3e7 Parents: 3ad0b50 Author: Steve Gill Authored: Fri Jul 29 17:16:02 2016 -0700 Committer: Steve Gill Committed: Mon Aug 1 17:14:54 2016 -0700 ---------------------------------------------------------------------- cordova-common/src/ConfigChanges/ConfigChanges.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/185a2424/cordova-common/src/ConfigChanges/ConfigChanges.js ---------------------------------------------------------------------- diff --git a/cordova-common/src/ConfigChanges/ConfigChanges.js b/cordova-common/src/ConfigChanges/ConfigChanges.js index a395c6d..e5b09a7 100644 --- a/cordova-common/src/ConfigChanges/ConfigChanges.js +++ b/cordova-common/src/ConfigChanges/ConfigChanges.js @@ -97,7 +97,10 @@ function remove_plugin_changes(pluginInfo, is_top_level) { var plugin_vars = is_top_level ? platform_config.installed_plugins[pluginInfo.id] : platform_config.dependent_plugins[pluginInfo.id]; - var edit_config_changes = pluginInfo.getEditConfigs(self.platform); + var edit_config_changes = null; + if(pluginInfo.getEditConfigs) { + edit_config_changes = pluginInfo.getEditConfigs(self.platform); + } // get config munge, aka how did this plugin change various config files var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes); @@ -131,7 +134,12 @@ PlatformMunger.prototype.add_plugin_changes = add_plugin_changes; function add_plugin_changes(pluginInfo, plugin_vars, is_top_level, should_increment, plugin_force) { var self = this; var platform_config = self.platformJson.root; - var edit_config_changes = pluginInfo.getEditConfigs(self.platform); + + var edit_config_changes = null; + if(pluginInfo.getEditConfigs) { + edit_config_changes = pluginInfo.getEditConfigs(self.platform); + } + var config_munge; if (!edit_config_changes || edit_config_changes.length === 0) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org