Merge branch 'CB-13145' of https://github.com/stevengill/cordova-common into CB-13145-steve
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/3af9a17c Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/3af9a17c Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/3af9a17c Branch: refs/heads/CB-13145 Commit: 3af9a17c92578194284698a358d7a5e84cfa0e30 Parents: 8f8887e 8988dc8 Author: Audrey So <audre...@apache.org> Authored: Tue Aug 22 17:40:39 2017 -0700 Committer: Audrey So <audre...@apache.org> Committed: Tue Aug 22 17:40:39 2017 -0700 ---------------------------------------------------------------------- src/PluginInfo/PluginInfo.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-common/blob/3af9a17c/src/PluginInfo/PluginInfo.js ---------------------------------------------------------------------- diff --cc src/PluginInfo/PluginInfo.js index 5b088ca,4cb5307..e399488 --- a/src/PluginInfo/PluginInfo.js +++ b/src/PluginInfo/PluginInfo.js @@@ -6,9 -6,9 +6,7 @@@ 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 @@@ -21,7 -21,7 +19,6 @@@ A class for holidng the information currently stored in plugin.xml It should also be able to answer questions like whether the plugin is compatible with a given engine version. -- TODO (kamrik): refactor this to not use sync functions and return promises. */ @@@ -435,4 -436,4 +433,4 @@@ PluginInfo.PluginInfo = PluginInfo PluginInfo.loadPluginsDir = function (dir) { var PluginInfoProvider = require('./PluginInfoProvider'); return new PluginInfoProvider().getAllWithinSearchPath(dir); --}; ++}; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
