removed modules/admin and moved mousetrap + keybindings out of client #2245

public/src/admin.js

@@ -4,7 +4,6 @@
 var admin = {};
 
 (function() {
-
 	admin.enableColorPicker = function(inputEl, callback) {
 		(inputEl instanceof jQuery ? inputEl : $(inputEl)).each(function() {
 			var $this = $(this);
@@ -48,6 +47,8 @@ var admin = {};
 				activate(parentEl);
 			}
 		});
+
+		setupKeybindings();
 	});
 
 	socket.emit('admin.config.get', function(err, config) {
@@ -63,5 +64,23 @@ var admin = {};
 
 		// move this to admin.config
 		app.config = config;
-	});
+	});	
+
+	function setupKeybindings() {
+		Mousetrap.bind('ctrl+shift+a r', function() {
+			console.log('[admin] Reloading NodeBB...');
+			socket.emit('admin.reload');
+		});
+
+		Mousetrap.bind('ctrl+shift+a R', function() {
+			console.log('[admin] Restarting NodeBB...');
+			socket.emit('admin.restart');
+		});
+
+		Mousetrap.bind('/', function(e) {
+			$('#acp-search input').focus();
+
+			return false;
+		});
+	}
 }());

public/src/app.js

@@ -582,11 +582,6 @@ var socket,
 					});
 				}
 			});
-
-			// Admin keyboard shortcuts
-			require(['admin'], function(Admin) {
-				Admin.init();
-			});
 		});
 	};
 

public/src/modules/admin.js

@@ -1,25 +0,0 @@
-define('admin', ['mousetrap'], function(Mousetrap) {
-	var Admin= {};
-
-	Admin.init = function() {
-		if (app.isAdmin) {
-			Mousetrap.bind('ctrl+shift+a r', function() {
-				console.log('[admin] Reloading NodeBB...');
-				socket.emit('admin.reload');
-			});
-
-			Mousetrap.bind('ctrl+shift+a R', function() {
-				console.log('[admin] Restarting NodeBB...');
-				socket.emit('admin.restart');
-			});
-
-			Mousetrap.bind('/', function(e) {
-				$('#acp-search input').focus();
-
-				return false;
-			});
-		}
-	};
-
-	return Admin;
-});

src/meta/js.js

@@ -38,7 +38,6 @@ module.exports = function(Meta) {
 				'public/vendor/xregexp/xregexp.js',
 				'public/vendor/xregexp/unicode/unicode-base.js',
 				'public/vendor/buzz/buzz.min.js',
-				'public/vendor/mousetrap/mousetrap.js',
 				'./node_modules/templates.js/lib/templates.js',
 				'public/src/utils.js',
 				'public/src/app.js',

src/views/admin/header.tpl

@@ -33,6 +33,7 @@
 	<script type="text/javascript" src="{relative_path}/vendor/semver/semver.browser.js"></script>
 	<script type="text/javascript" src="{relative_path}/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js"></script>
 	<script type="text/javascript" src="{relative_path}/vendor/jquery/deserialize/jquery.deserialize.min.js"></script>
+	<script type="text/javascript" src="{relative_path}/vendor/mousetrap/mousetrap.js"></script>
 
 	<script>
 		require.config({