Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed #1351 -- themes and plugins no longer auto-restart the server

Browse Source
This commit is contained in:
Julian Lam
2014-04-16 14:45:47 -04:00
parent 9dbe479d11
commit 8cb2b9b97a
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/src/forum/admin/plugins.js
View File

@@ -1,3 +1,6 @@
"use strict";
/* global define, app, socket */
define(function() { define(function() {
var Plugins = { var Plugins = {
init: function() { init: function() {
@@ -19,10 +22,13 @@ define(function() {
app.alert({ app.alert({
alert_id: 'plugin_toggled', alert_id: 'plugin_toggled',
title: 'Plugin ' + (status.active ? 'Enabled' : 'Disabled'), title: 'Plugin ' + (status.active ? 'Enabled' : 'Disabled'),
message: 'Restarting your NodeBB <i class="fa fa-refresh fa-spin"></i>', message: 'Please restart your NodeBB to fully ' + (status.active ? 'activate' : 'deactivate') + ' this plugin',
type: 'warning', type: 'info',
timeout: 5000 timeout: 5000,
}) clickfn: function() {
socket.emit('admin.restart');
}
});
}); });
} else { } else {
pluginsList.append('<li><p><i>No plugins found.</i></p></li>'); pluginsList.append('<li><p><i>No plugins found.</i></p></li>');

9
public/src/forum/admin/themes.js
View File

@@ -39,10 +39,13 @@ define(['forum/admin/settings'], function(Settings) {
app.alert({ app.alert({
alert_id: 'admin:theme', alert_id: 'admin:theme',
type: 'success', type: 'info',
title: 'Theme Changed', title: 'Theme Changed',
message: 'Restarting your NodeBB <i class="fa fa-refresh fa-spin"></i>', message: 'Please restart your NodeBB to fully activate this theme',
timeout: 3500 timeout: 5000,
clickfn: function() {
socket.emit('admin.restart');
}
}); });
}); });
} }

2
src/socket.io/admin.js
View File

@@ -79,7 +79,6 @@ SocketAdmin.themes.set = function(socket, data, callback) {
widgets.reset(function(err) { widgets.reset(function(err) {
meta.themes.set(data, function() { meta.themes.set(data, function() {
callback(); callback();
meta.restart();
}); });
}); });
}; };
@@ -87,7 +86,6 @@ SocketAdmin.themes.set = function(socket, data, callback) {
SocketAdmin.plugins.toggle = function(socket, plugin_id) { SocketAdmin.plugins.toggle = function(socket, plugin_id) {
plugins.toggleActive(plugin_id, function(status) { plugins.toggleActive(plugin_id, function(status) {
socket.emit('admin.plugins.toggle', status); socket.emit('admin.plugins.toggle', status);
meta.restart();
}); });
}; };