You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/03/03 09:53:23 UTC
cordova-lib git commit: cleaning up whitespace
Repository: cordova-lib
Updated Branches:
refs/heads/CB-8551 f74768834 -> cfdcc066e
cleaning up whitespace
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/cfdcc066
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/cfdcc066
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/cfdcc066
Branch: refs/heads/CB-8551
Commit: cfdcc066ecea14d77d88da8c9de2076274d7649a
Parents: f747688
Author: Steve Gill <st...@gmail.com>
Authored: Tue Mar 3 00:52:29 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Mar 3 00:52:29 2015 -0800
----------------------------------------------------------------------
cordova-lib/src/cordova/plugin.js | 5 -----
cordova-lib/src/plugman/uninstall.js | 1 +
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/cfdcc066/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js
index 205af3f..46c4184 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -237,11 +237,8 @@ module.exports = function plugin(command, targets, opts) {
return hooksRunner.fire('before_plugin_rm', opts)
.then(function() {
return opts.plugins.reduce(function(soFar, target) {
- /*
-*/
// Check if we have the plugin.
if (plugins.indexOf(target) < 0) {
-
// Convert target from package-name to package-id if necessary
var keys = Object.keys(pluginMapper);
//Traverse through pluginMapper values to see if it equals our target.
@@ -255,7 +252,6 @@ module.exports = function plugin(command, targets, opts) {
}
if (plugins.indexOf(target) < 0) {
-
return Q.reject(new CordovaError('Plugin "' + target + '" is not present in the project. See `'+cordova_util.binname+' plugin list`.'));
}
}
@@ -299,7 +295,6 @@ module.exports = function plugin(command, targets, opts) {
opts.cordova = { plugins: cordova_util.findPlugins(path.join(projectRoot, 'plugins')) };
return hooksRunner.fire('after_plugin_rm', opts);
});
-
case 'search':
return hooksRunner.fire('before_plugin_search')
.then(function() {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/cfdcc066/cordova-lib/src/plugman/uninstall.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/uninstall.js b/cordova-lib/src/plugman/uninstall.js
index ecb4518..6a84ea1 100644
--- a/cordova-lib/src/plugman/uninstall.js
+++ b/cordova-lib/src/plugman/uninstall.js
@@ -47,6 +47,7 @@ function uninstall(platform, project_dir, id, plugins_dir, options) {
options.is_top_level = true;
options.pluginInfoProvider = options.pluginInfoProvider || new PluginInfoProvider();
plugins_dir = plugins_dir || path.join(project_dir, 'cordova', 'plugins');
+
// Allow `id` to be a path to a file.
var xml_path = path.join(id, 'plugin.xml');
if ( fs.existsSync(xml_path) ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org