closed #2583

public/src/app.js

@@ -568,8 +568,11 @@ app.uid = null;
 				}
 			});
 
-			require(['taskbar'], function(taskbar) {
+			require(['taskbar', 'helpers'], function(taskbar, helpers) {
 				taskbar.init();
+
+				// templates.js helpers
+				helpers.register();
 			});
 		});
 	};

public/src/modules/helpers.js

@@ -1,8 +1,12 @@
-"use strict";
+;(function(exports) {
-/*global templates*/
+	"use strict";
+	/* globals define */
 
+	// export the class if we are in a Node-like system.
+	if (typeof module === 'object' && module.exports === exports) {
+	  exports = module.exports/* = SemVer*/;
+	}
 
-(function(module) {
 	var helpers = {};
 
 	helpers.displayUsersLink = function(config) {
@@ -30,20 +34,27 @@
 		}
 	};
 
-	if ('undefined' !== typeof window) {
+	exports.register = function() {
-		$(document).ready(module.exports);
+		var templates;
-	}
 
-	module.exports = function() {
+		if (typeof module === 'object') {
-		var templates = templates || require('templates.js');
+			templates = require('templates.js');
+		} else {
+			templates = window.templates;
+		}
 
 		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
 		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
 		templates.registerHelper('membershipBtn', helpers.membershipBtn);
 	};
 
-})('undefined' === typeof module ? {
+	// Use the define() function if we're in AMD land
-	module: {
+	if (typeof define === 'function' && define.amd) {
-		exports: {}
+	  define('helpers', exports);
 	}
-} : module);
+
+})(
+	typeof exports === 'object' ? exports :
+	typeof define === 'function' && define.amd ? {} :
+	helpers = {}
+);

src/meta/js.js

@@ -45,7 +45,6 @@ module.exports = function(Meta) {
 				'public/src/variables.js',
 				'public/src/widgets.js',
 				'public/src/translator.js',
-				'public/src/helpers.js',
 				'public/src/overrides.js'
 			],
 			rjs: []

src/webserver.js

@@ -18,7 +18,7 @@ var path = require('path'),
 	routes = require('./routes'),
 	emitter = require('./emitter'),
 
-	helpers = require('./../public/src/helpers')(),
+	helpers = require('./../public/src/modules/helpers'),
 	net;
 
 if(nconf.get('ssl')) {
@@ -48,6 +48,9 @@ if(nconf.get('ssl')) {
 		middleware = middleware(app);
 		routes(app, middleware);
 
+		// Load server-side template helpers
+		helpers.register();
+
 		// Cache static files on production
 		if (global.env !== 'development') {
 			app.enable('cache');