#3430

public/src/admin/admin.js

@@ -74,7 +74,6 @@
 		});
 
 		Mousetrap.bind('ctrl+shift+a R', function() {
-			console.log('[admin] Restarting NodeBB...');
 			socket.emit('admin.restart');
 		});
 
@@ -196,9 +195,9 @@
 
 			if (checked) {
 				checkbox.after('<i class="fa fa-toggle-on"></i>');
-			} 
+			}
 			else {
-				checkbox.after('<i class="fa fa-toggle-off"></i>');   
+				checkbox.after('<i class="fa fa-toggle-off"></i>');
 			}
 
 			checkbox.attr('data-toggle-added', true);

public/src/ajaxify.js

@@ -253,8 +253,6 @@ $(document).ready(function() {
 	};
 
 	function ajaxifyAnchors() {
-		templates.registerLoader(ajaxify.loadTemplate);
-
 		function hrefEmpty(href) {
 			return href === undefined || href === '' || href === 'javascript:;';
 		}
@@ -298,6 +296,8 @@ $(document).ready(function() {
 		});
 	}
 
+	templates.registerLoader(ajaxify.loadTemplate);
+
 	if (window.history && window.history.pushState) {
 		// Progressive Enhancement, ajaxify available only to modern browsers
 		ajaxifyAnchors();

public/src/app.js

@@ -92,7 +92,7 @@ app.cacheBuster = null;
 
 			switch(url_parts[0]) {
 				case 'user':
-					room = 'user/' + ajaxify.data.theirid;
+					room = 'user/' + ajaxify.data ? ajaxify.data.theirid : 0;
 				break;
 				case 'topic':
 					room = 'topic_' + url_parts[1];

public/src/modules/settings.js

@@ -294,7 +294,6 @@ define('settings', function () {
 							message: "NodeBB failed to save the settings.",
 							timeout: 5000
 						});
-						console.log('[settings] Unable to set settings for hash: ', hash);
 					} else {
 						app.alert({
 							title: 'Settings Saved',
@@ -387,7 +386,6 @@ define('settings', function () {
 				hash: hash
 			}, function (err, values) {
 				if (err) {
-					console.log('[settings] Unable to load settings for hash: ', hash);
 					if (typeof callback === 'function') {
 						callback(err);
 					}
@@ -455,10 +453,9 @@ define('settings', function () {
 				hash: hash
 			}, function (err, values) {
 				if (err) {
-					console.log('[settings] Unable to load settings for hash: ', hash);
 					return callback(err);
 				}
-				
+
 				// Parse all values. If they are json, return json
 				for(var key in values) {
 					if (values.hasOwnProperty(key)) {
@@ -508,8 +505,6 @@ define('settings', function () {
 						});
 					}
 				});
-			} else {
-				console.log('[settings] Form not found.');
 			}
 		}
 	};

public/src/modules/sounds.js

@@ -1,5 +1,5 @@
 "use strict";
-/* global define, socket, config */
+/* global app, define, socket, config */
 
 define('sounds', ['buzz'], function(buzz) {
 	var	Sounds = {};
@@ -17,7 +17,7 @@ define('sounds', ['buzz'], function(buzz) {
 	function loadFiles() {
 		socket.emit('modules.sounds.getSounds', function(err, sounds) {
 			if (err) {
-				return console.log('[sounds] Could not initialise!');
+				return app.alertError('[sounds] Could not initialise!');
 			}
 
 			files = sounds;
@@ -27,7 +27,7 @@ define('sounds', ['buzz'], function(buzz) {
 	function loadMapping() {
 		socket.emit('modules.sounds.getMapping', function(err, mapping) {
 			if (err) {
-				return console.log('[sounds] Could not load sound mapping!');
+				return app.alertError('[sounds] Could not load sound mapping!');
 			}
 			eventSoundMapping = mapping;
 		});
@@ -65,7 +65,7 @@ define('sounds', ['buzz'], function(buzz) {
 			if (loadedSounds[fileName]) {
 				loadedSounds[fileName].play();
 			} else {
-				console.log('[sounds] Not found:', fileName);
+				app.alertError('[sounds] Not found: ' + fileName);
 			}
 		}
 

public/src/modules/translator.js

@@ -302,7 +302,9 @@
 		// Expose a global `translator` object for backwards compatibility
 		window.translator = {
 			translate: function() {
-				console.warn('[translator] Global invocation of the translator is now deprecated, please `require` the module instead.');
+				if (typeof console !== 'undefined' && console.warn) {
+					console.warn('[translator] Global invocation of the translator is now deprecated, please `require` the module instead.');
+				}
 				_translator.translate.apply(_translator, arguments);
 			}
 		}

public/src/variables.js

@@ -7,14 +7,14 @@
 	ajaxify.variables = {};
 
 	ajaxify.variables.set = function(key, value) {
-		if (console && console.warn) {
-			console.warn('[deprecated] variables.set is deprecated, please use ajaxify.data, key=' + key);
-		}
+		if (typeof console !== 'undefined' && console.warn) {
+		 	console.warn('[deprecated] variables.set is deprecated, please use ajaxify.data, key=' + key);
+		 }
 		parsedVariables[key] = value;
 	};
 
 	ajaxify.variables.get = function(key) {
-		if (console && console.warn) {
+		if (typeof console !== 'undefined' && console.warn) {
 			console.warn('[deprecated] variables.get is deprecated, please use ajaxify.data, key=' + key);
 		}
 		return parsedVariables[key];