closes #2483

public/src/admin/extend/plugins.js

@@ -1,14 +1,17 @@
 "use strict";
-/* global define, app, socket */
+/* global define, app, socket, bootbox */
 
 define('admin/extend/plugins', function() {
-	var Plugins = {
+	var Plugins = {};
-		init: function() {
+	Plugins.init = function() {
 		var pluginsList = $('.plugins'),
 			numPlugins = pluginsList[0].querySelectorAll('li').length,
 			pluginID;
 
-			if (numPlugins > 0) {
+		if (!numPlugins) {
+			pluginsList.append('<li><p><i>No plugins found.</i></p></li>');
+			return;
+		}
 
 		pluginsList.on('click', 'button[data-action="toggleActive"]', function() {
 			pluginID = $(this).parents('li').attr('data-plugin-id');
@@ -33,31 +36,29 @@ define('admin/extend/plugins', function() {
 		pluginsList.on('click', 'button[data-action="toggleInstall"]', function() {
 			pluginID = $(this).parents('li').attr('data-plugin-id');
 
+			if ($(this).attr('data-installed') === '1') {
+				return Plugins.toggleInstall(pluginID, $(this).parents('li').attr('data-version'));
+			}
+
 			Plugins.suggest(pluginID, function(err, payload) {
-						if (!err) {
+				if (err) {
-							require(['semver'], function(semver) {
-								if (payload.version !== 'latest') {
-									Plugins.toggleInstall(pluginID, payload.version);
-								} else if (payload.version === 'latest') {
-									bootbox.confirm(
-										'<div class="alert alert-warning"><p><strong>No Compatibility Infomation Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div>' +
-										'<p>In the event that NodeBB cannot boot properly:</p>' +
-										'<pre><code>$ ./nodebb reset plugin="' + pluginID + '"</code></pre>' +
-										'<p>Continue installation of latest version of this plugin?</p>'
-									, function(confirm) {
-										if (confirm) {
-											Plugins.toggleInstall(pluginID, 'latest');
-										}
-									});
-								}
-							});
-						} else {
 					bootbox.confirm('<p>NodeBB could not reach the package manager, proceed with installation of latest version?</p><div class="alert alert-danger"><strong>Server returned (' + err.status + ')</strong>: ' + err.responseText + '</div>', function(confirm) {
 						if (confirm) {
 							Plugins.toggleInstall(pluginID, 'latest');
 						}
 					});
+					return;
 				}
+
+				require(['semver'], function(semver) {
+					if (payload.version !== 'latest') {
+						Plugins.toggleInstall(pluginID, payload.version);
+					} else if (payload.version === 'latest') {
+						confirmInstall(pluginID, function() {
+							Plugins.toggleInstall(pluginID, 'latest');
+						});
+					}
+				});
 			});
 		});
 
@@ -66,55 +67,25 @@ define('admin/extend/plugins', function() {
 			var parent = btn.parents('li');
 			pluginID = parent.attr('data-plugin-id');
 
-
 			Plugins.suggest(pluginID, function(err, payload) {
-						if (!err) {
+				if (err) {
+					return bootbox.alert('<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>');
+				}
+
 				require(['semver'], function(semver) {
 					if (payload.version !== 'latest' && semver.gt(payload.version, parent.find('.currentVersion').text())) {
-									btn.attr('disabled', true).find('i').attr('class', 'fa fa-refresh fa-spin');
+						upgrade(pluginID, btn, payload.version);
-									socket.emit('admin.plugins.upgrade', {
-										id: pluginID,
-										version: payload.version
-									}, function(err) {
-										if (err) {
-											return app.alertError(err.message);
-										}
-										parent.find('.fa-exclamation-triangle').remove();
-										parent.find('.currentVersion').text(payload.version);
-										btn.remove();
-									});
 					} else if (payload.version === 'latest') {
-									bootbox.confirm(
+						confirmInstall(pluginID, function() {
-										'<div class="alert alert-warning"><p><strong>No Compatibility Infomation Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div>' +
+							upgrade(pluginID, btn, payload.version);
-										'<p>In the event that NodeBB cannot boot properly:</p>' +
-										'<pre><code>$ ./nodebb reset plugin="' + pluginID + '"</code></pre>' +
-										'<p>Continue installation of latest version of this plugin?</p>'
-									, function(confirm) {
-										if (confirm) {
-											socket.emit('admin.plugins.upgrade', {
-												id: pluginID,
-												version: payload.version
-											}, function(err) {
-												if (err) {
-													return app.alertError(err.message);
-												}
-												parent.find('.fa-exclamation-triangle').remove();
-												parent.find('.currentVersion').text(payload.version);
-												btn.remove();
-											});
-										}
 						});
 					} else {
 						bootbox.alert('<p>Your version of NodeBB (v' + app.config.version + ') is only cleared to upgrade to v' + payload.version + ' of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.');
 					}
 				});
-						} else {
-							bootbox.alert('<p>NodeBB could not reach the package manager, an upgrade is not suggested at this time.</p>');
-						}
 			});
 		});
 
-
 		$('#plugin-search').on('input propertychange', function() {
 			var term = $(this).val();
 			$('.plugins li').each(function() {
@@ -122,12 +93,37 @@ define('admin/extend/plugins', function() {
 				$(this).toggleClass('hide', pluginId && pluginId.indexOf(term) === -1);
 			});
 		});
+	};
 
-			} else {
+	function confirmInstall(pluginID, callback) {
-				pluginsList.append('<li><p><i>No plugins found.</i></p></li>');
+		bootbox.confirm(
+			'<div class="alert alert-warning"><p><strong>No Compatibility Infomation Found</strong></p><p>This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.</p></div>' +
+			'<p>In the event that NodeBB cannot boot properly:</p>' +
+			'<pre><code>$ ./nodebb reset plugin="' + pluginID + '"</code></pre>' +
+			'<p>Continue installation of latest version of this plugin?</p>', function(confirm) {
+			if (confirm) {
+				callback();
 			}
-		},
+		});
-		toggleInstall: function(pluginID, version, callback) {
+	}
+
+	function upgrade(pluginID, btn, version) {
+		btn.attr('disabled', true).find('i').attr('class', 'fa fa-refresh fa-spin');
+		socket.emit('admin.plugins.upgrade', {
+			id: pluginID,
+			version: version
+		}, function(err) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+			var parent = btn.parents('li');
+			parent.find('.fa-exclamation-triangle').remove();
+			parent.find('.currentVersion').text(version);
+			btn.remove();
+		});
+	}
+
+	Plugins.toggleInstall = function(pluginID, version, callback) {
 		var btn = $('li[data-plugin-id="' + pluginID + '"] button[data-action="toggleInstall"]');
 		var activateBtn = btn.siblings('[data-action="toggleActive"]');
 		btn.html(btn.html() + 'ing')
@@ -146,12 +142,14 @@ define('admin/extend/plugins', function() {
 				btn.html('<i class="fa fa-trash-o"></i> Uninstall');
 			} else {
 				btn.html('<i class="fa fa-download"></i> Install');
-
 			}
+
 			activateBtn.toggleClass('hidden', !status.installed);
 
-				btn.toggleClass('btn-danger', status.installed).toggleClass('btn-success', !status.installed)
+			btn.toggleClass('btn-danger', status.installed)
-					.attr('disabled', false);
+				.toggleClass('btn-success', !status.installed)
+				.attr('disabled', false)
+				.attr('data-installed', status.installed ? 1 : 0);
 
 			app.alert({
 				alert_id: 'plugin_toggled',
@@ -165,8 +163,9 @@ define('admin/extend/plugins', function() {
 				callback.apply(this, arguments);
 			}
 		});
-		},
+	};
-		suggest: function(pluginId, callback) {
+
+	Plugins.suggest = function(pluginId, callback) {
 		var nbbVersion = app.config.version;
 		$.ajax('https://packages.nodebb.org/api/v1/suggest', {
 			type: 'GET',
@@ -178,7 +177,6 @@ define('admin/extend/plugins', function() {
 		}).done(function(payload) {
 			callback(undefined, payload);
 		}).fail(callback);
-		}
 	};
 
 	return Plugins;

src/views/admin/extend/plugins.tpl

@@ -6,11 +6,11 @@
 				<ul>
 					<!-- BEGIN plugins -->
 					<!-- IF plugins.installed -->
-					<li data-plugin-id="{plugins.id}" class="clearfix">
+					<li data-plugin-id="{plugins.id}" data-version="{plugins.version}" class="clearfix">
 						<div class="pull-right">
 							<button data-action="toggleActive" class="btn <!-- IF plugins.active --> btn-warning<!-- ELSE --> btn-success<!-- ENDIF plugins.active -->"><i class="fa fa-power-off"></i> <!-- IF plugins.active -->Deactivate<!-- ELSE -->Activate<!-- ENDIF plugins.active --></button>
 
-							<button data-action="toggleInstall" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
+							<button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
 						</div>
 
 						<h2><strong>{plugins.name}</strong></h2>
@@ -41,7 +41,7 @@
 					<li data-plugin-id="{plugins.id}" class="clearfix">
 						<div class="pull-right">
 							<button data-action="toggleActive" class="btn btn-success hidden"><i class="fa fa-power-off"></i> Activate</button>
-							<button data-action="toggleInstall" class="btn btn-success"><i class="fa fa-download"></i> Install</button>
+							<button data-action="toggleInstall" data-installed="0" class="btn btn-success"><i class="fa fa-download"></i> Install</button>
 						</div>
 
 						<h2><strong>{plugins.name}</strong></h2>