From 5885e37127187828cac3f37203e94cac05cb0906 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Wed, 30 Aug 2017 10:50:28 -0600
Subject: [PATCH] Switch admin t.js usage to Benchpress

---
 public/src/admin/appearance/skins.js    | 4 ++--
 public/src/admin/appearance/themes.js   | 4 ++--
 public/src/admin/extend/plugins.js      | 4 ++--
 public/src/admin/extend/rewards.js      | 4 ++--
 public/src/admin/general/dashboard.js   | 4 ++--
 public/src/admin/general/navigation.js  | 6 +++---
 public/src/admin/manage/categories.js   | 6 +++---
 public/src/admin/manage/category.js     | 7 ++++---
 public/src/admin/manage/group.js        | 5 +++--
 public/src/admin/manage/groups.js       | 4 ++--
 public/src/admin/manage/ip-blacklist.js | 4 ++--
 public/src/admin/manage/users.js        | 8 ++++----
 12 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js
index f234cac414..7ec56349f7 100644
--- a/public/src/admin/appearance/skins.js
+++ b/public/src/admin/appearance/skins.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/appearance/skins', ['translator'], function (translator) {
+define('admin/appearance/skins', ['translator', 'benchpress'], function (translator, Benchpress) {
 	var Skins = {};
 
 	Skins.init = function () {
@@ -52,7 +52,7 @@ define('admin/appearance/skins', ['translator'], function (translator) {
 	Skins.render = function (bootswatch) {
 		var themeContainer = $('#bootstrap_themes');
 
-		templates.parse('admin/partials/theme_list', {
+		Benchpress.parse('admin/partials/theme_list', {
 			themes: bootswatch.themes.map(function (theme) {
 				return {
 					type: 'bootswatch',
diff --git a/public/src/admin/appearance/themes.js b/public/src/admin/appearance/themes.js
index 68165268b2..64d7a202fd 100644
--- a/public/src/admin/appearance/themes.js
+++ b/public/src/admin/appearance/themes.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/appearance/themes', ['translator'], function (translator) {
+define('admin/appearance/themes', ['translator', 'benchpress'], function (translator, Benchpress) {
 	var Themes = {};
 
 	Themes.init = function () {
@@ -73,7 +73,7 @@ define('admin/appearance/themes', ['translator'], function (translator) {
 			if (!themes.length) {
 				instListEl.append($('<li/ >').addClass('no-themes').translateHtml('[[admin/appearance/themes:no-themes]]'));
 			} else {
-				templates.parse('admin/partials/theme_list', {
+				Benchpress.parse('admin/partials/theme_list', {
 					themes: themes,
 				}, function (html) {
 					translator.translate(html, function (html) {
diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js
index c5b2b2ff70..1debd9b168 100644
--- a/public/src/admin/extend/plugins.js
+++ b/public/src/admin/extend/plugins.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, translator) {
+define('admin/extend/plugins', ['jqueryui', 'translator', 'benchpress'], function (jqueryui, translator, Benchpress) {
 	var Plugins = {};
 	Plugins.init = function () {
 		var pluginsList = $('.plugins');
@@ -58,7 +58,7 @@ define('admin/extend/plugins', ['jqueryui', 'translator'], function (jqueryui, t
 			}
 
 			if (pluginData.license && pluginData.active !== true) {
-				templates.parse('admin/partials/plugins/license', pluginData, function (html) {
+				Benchpress.parse('admin/partials/plugins/license', pluginData, function (html) {
 					bootbox.dialog({
 						title: '[[admin/extend/plugins:license.title]]',
 						message: html,
diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js
index fe1322b8e2..acfcb0bb39 100644
--- a/public/src/admin/extend/rewards.js
+++ b/public/src/admin/extend/rewards.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/extend/rewards', ['translator'], function (translator) {
+define('admin/extend/rewards', ['translator', 'benchpress'], function (translator, Benchpress) {
 	var rewards = {};
 
 
@@ -139,7 +139,7 @@ define('admin/extend/rewards', ['translator'], function (translator) {
 			rewards: available,
 		};
 
-		templates.parse('admin/extend/rewards', 'active', data, function (li) {
+		Benchpress.parse('admin/extend/rewards', 'active', data, function (li) {
 			translator.translate(li, function (li) {
 				li = $(li);
 				ul.append(li);
diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js
index 2d08c73685..9bc29a2ceb 100644
--- a/public/src/admin/general/dashboard.js
+++ b/public/src/admin/general/dashboard.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (semver, Chart, translator) {
+define('admin/general/dashboard', ['semver', 'Chart', 'translator', 'benchpress'], function (semver, Chart, translator, Benchpress) {
 	var	Admin = {};
 	var	intervals = {
 		rooms: false,
@@ -317,7 +317,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
 			$('[data-action="updateGraph"][data-units="custom"]').on('click', function () {
 				var targetEl = $(this);
 
-				templates.parse('admin/partials/pageviews-range-select', {}, function (html) {
+				Benchpress.parse('admin/partials/pageviews-range-select', {}, function (html) {
 					var modal = bootbox.dialog({
 						title: '[[admin/general/dashboard:page-views-custom]]',
 						message: html,
diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index 5269c1c2c0..9e44ac0468 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], function (translator, iconSelect) {
+define('admin/general/navigation', ['translator', 'iconSelect', 'benchpress', 'jqueryui'], function (translator, iconSelect, Benchpress) {
 	var navigation = {};
 	var available;
 
@@ -68,7 +68,7 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
 		data.enabled = false;
 		data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1;
 
-		templates.parse('admin/general/navigation', 'navigation', { navigation: [data] }, function (li) {
+		Benchpress.parse('admin/general/navigation', 'navigation', { navigation: [data] }, function (li) {
 			translator.translate(li, function (li) {
 				li = $(translator.unescape(li));
 				el.after(li);
@@ -76,7 +76,7 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
 			});
 		});
 
-		templates.parse('admin/general/navigation', 'enabled', { enabled: [data] }, function (li) {
+		Benchpress.parse('admin/general/navigation', 'enabled', { enabled: [data] }, function (li) {
 			translator.translate(li, function (li) {
 				li = $(translator.unescape(li));
 				$('#enabled').append(li);
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index 2951481411..5d211d00ca 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-serializeobject.min', 'translator'], function (serialize, translator) {
+define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-serializeobject.min', 'translator', 'benchpress'], function (serialize, translator, Benchpress) {
 	var	Categories = {};
 	var newCategoryId = -1;
 	var sortables;
@@ -45,7 +45,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 				return app.alertError(err.message);
 			}
 
-			templates.parse('admin/partials/categories/create', {
+			Benchpress.parse('admin/partials/categories/create', {
 				categories: categories,
 			}, function (html) {
 				var modal = bootbox.dialog({
@@ -185,7 +185,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 		}
 
 		function continueRender() {
-			templates.parse('admin/partials/categories/category-rows', {
+			Benchpress.parse('admin/partials/categories/category-rows', {
 				cid: parentId,
 				categories: categories,
 			}, function (html) {
diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 2115db338e..8ac0ecdf15 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -8,7 +8,8 @@ define('admin/manage/category', [
 	'autocomplete',
 	'translator',
 	'categorySelector',
-], function (uploader, iconSelect, colorpicker, autocomplete, translator, categorySelector) {
+	'benchpress',
+], function (uploader, iconSelect, colorpicker, autocomplete, translator, categorySelector, Benchpress) {
 	var	Category = {};
 	var modified_categories = {};
 
@@ -248,7 +249,7 @@ define('admin/manage/category', [
 				return app.alertError(err.message);
 			}
 
-			templates.parse('admin/partials/categories/privileges', {
+			Benchpress.parse('admin/partials/categories/privileges', {
 				privileges: privileges,
 			}, function (html) {
 				translator.translate(html, function (html) {
@@ -407,7 +408,7 @@ define('admin/manage/category', [
 			callback = categories;
 			categories = ajaxify.data.allCategories;
 		}
-		templates.parse('admin/partials/categories/select-category', {
+		Benchpress.parse('admin/partials/categories/select-category', {
 			categories: categories,
 		}, function (html) {
 			translator.translate(html, function (html) {
diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index b334dcb3fb..910db07af7 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -6,7 +6,8 @@ define('admin/manage/group', [
 	'iconSelect',
 	'admin/modules/colorpicker',
 	'translator',
-], function (memberList, iconSelect, colorpicker, translator) {
+	'benchpress',
+], function (memberList, iconSelect, colorpicker, translator, Benchpress) {
 	var Groups = {};
 
 	Groups.init = function () {
@@ -103,7 +104,7 @@ define('admin/manage/group', [
 					'icon:text': userLabel.attr('data-usericon-text'),
 				};
 
-				templates.parse('admin/partials/groups/memberlist', 'members', {
+				Benchpress.parse('admin/partials/groups/memberlist', 'members', {
 					group: {
 						isOwner: ajaxify.data.group.isOwner,
 						members: [member],
diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js
index 5aa7b969b7..5b42e9eb64 100644
--- a/public/src/admin/manage/groups.js
+++ b/public/src/admin/manage/groups.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/manage/groups', ['translator'], function (translator) {
+define('admin/manage/groups', ['translator', 'benchpress'], function (translator, Benchpress) {
 	var	Groups = {};
 
 	var intervalId = 0;
@@ -94,7 +94,7 @@ define('admin/manage/groups', ['translator'], function (translator) {
 					return app.alertError(err.message);
 				}
 
-				templates.parse('admin/manage/groups', 'groups', {
+				Benchpress.parse('admin/manage/groups', 'groups', {
 					groups: groups,
 				}, function (html) {
 					translator.translate(html, function (html) {
diff --git a/public/src/admin/manage/ip-blacklist.js b/public/src/admin/manage/ip-blacklist.js
index 4b5b37ce11..5e6589da9c 100644
--- a/public/src/admin/manage/ip-blacklist.js
+++ b/public/src/admin/manage/ip-blacklist.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/manage/ip-blacklist', ['Chart'], function (Chart) {
+define('admin/manage/ip-blacklist', ['Chart', 'benchpress'], function (Chart, Benchpress) {
 	var Blacklist = {};
 
 	Blacklist.init = function () {
@@ -32,7 +32,7 @@ define('admin/manage/ip-blacklist', ['Chart'], function (Chart) {
 					return app.alertError(err.message);
 				}
 
-				templates.parse('admin/partials/blacklist-validate', data, function (html) {
+				Benchpress.parse('admin/partials/blacklist-validate', data, function (html) {
 					bootbox.alert(html);
 				});
 			});
diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js
index 507067337c..8c22a65720 100644
--- a/public/src/admin/manage/users.js
+++ b/public/src/admin/manage/users.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/manage/users', ['translator'], function (translator) {
+define('admin/manage/users', ['translator', 'benchpress'], function (translator, Benchpress) {
 	var Users = {};
 
 	Users.init = function () {
@@ -81,7 +81,7 @@ define('admin/manage/users', ['translator'], function (translator) {
 				return false;	// specifically to keep the menu open
 			}
 
-			templates.parse('admin/partials/temporary-ban', {}, function (html) {
+			Benchpress.parse('admin/partials/temporary-ban', {}, function (html) {
 				bootbox.dialog({
 					className: 'ban-modal',
 					title: '[[user:ban_account]]',
@@ -248,7 +248,7 @@ define('admin/manage/users', ['translator'], function (translator) {
 
 		function handleUserCreate() {
 			$('#createUser').on('click', function () {
-				templates.parse('admin/partials/create_user_modal', {}, function (html) {
+				Benchpress.parse('admin/partials/create_user_modal', {}, function (html) {
 					bootbox.dialog({
 						message: html,
 						title: '[[admin/manage/users:alerts.create]]',
@@ -323,7 +323,7 @@ define('admin/manage/users', ['translator'], function (translator) {
 						return app.alertError(err.message);
 					}
 
-					templates.parse('admin/manage/users', 'users', data, function (html) {
+					Benchpress.parse('admin/manage/users', 'users', data, function (html) {
 						translator.translate(html, function (html) {
 							html = $(html);
 							$('.users-table tr').not(':first').remove();