You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/06/06 18:57:08 UTC
git commit: fixing uninstall
Repository: cordova-plugman
Updated Branches:
refs/heads/browserify bb88eeae7 -> 892739587
fixing uninstall
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/89273958
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/89273958
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/89273958
Branch: refs/heads/browserify
Commit: 89273958702c94b38354a78787386a5431bec1d6
Parents: bb88eea
Author: Anis Kadri <an...@apache.org>
Authored: Thu Jun 5 16:49:20 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Jun 5 16:49:20 2014 -0700
----------------------------------------------------------------------
src/prepare-browserify.js | 4 ++--
src/uninstall.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/89273958/src/prepare-browserify.js
----------------------------------------------------------------------
diff --git a/src/prepare-browserify.js b/src/prepare-browserify.js
index 8b1c868..1ba3f14 100644
--- a/src/prepare-browserify.js
+++ b/src/prepare-browserify.js
@@ -38,7 +38,7 @@ var platform_modules = require('./platforms'),
requireTr = require('cordova-js/tasks/lib/require-tr'),
writeLicenseHeader = require('cordova-js/tasks/lib/write-license-header');
-function uninstallQueuedPlugins(platform_json) {
+function uninstallQueuedPlugins(platform_json, wwwDir) {
// Check if there are any plugins queued for uninstallation, and if so, remove any of their plugin web assets loaded in
// via <js-module> elements
var plugins_to_uninstall = platform_json.prepare_queue.uninstalled;
@@ -100,7 +100,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
var wwwDir = www_dir || platform_modules[platform].www_dir(project_dir);
var scripts = [];
- uninstallQueuedPlugins(platform_json);
+ uninstallQueuedPlugins(platform_json, www_dir);
events.emit('verbose', 'Processing configuration changes for plugins.');
config_changes.process(plugins_dir, project_dir, platform);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/89273958/src/uninstall.js
----------------------------------------------------------------------
diff --git a/src/uninstall.js b/src/uninstall.js
index 04ecb1a..4572f52 100644
--- a/src/uninstall.js
+++ b/src/uninstall.js
@@ -283,6 +283,6 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
// queue up the plugin so prepare can remove the config changes
config_changes.add_uninstalled_plugin_to_prepare_queue(plugins_dir, plugin_id, platform, is_top_level);
// call prepare after a successful uninstall
- plugman.prepare(project_dir, platform, plugins_dir, www_dir);
+ plugman.prepare(project_dir, platform, plugins_dir, www_dir, is_top_level);
});
}