fix: remove some unnecessary jquery wrappers

NodeBB · Nov 9, 2020 · 9f7902e · 9f7902e
1 parent 978f1ee
commit 9f7902e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js
@@ -140,7 +140,6 @@ define('admin/extend/rewards', [], function () {
 		};
 
 		app.parseAndTranslate('admin/extend/rewards', 'active', data, function (li) {
-			li = $(li);
 			ul.append(li);
 			li.find('select').val('');
 		});

diff --git a/public/src/admin/settings/navigation.js b/public/src/admin/settings/navigation.js
@@ -4,10 +4,11 @@
 define('admin/settings/navigation', [
 	'translator',
 	'iconSelect',
+	'benchpress',
 	'jquery-ui/widgets/draggable',
 	'jquery-ui/widgets/droppable',
 	'jquery-ui/widgets/sortable',
-], function (translator, iconSelect) {
+], function (translator, iconSelect, Benchpress) {
 	var navigation = {};
 	var available;
 
@@ -69,16 +70,19 @@ define('admin/settings/navigation', [
 		data.title = translator.escape(data.title);
 		data.text = translator.escape(data.text);
 		data.groups = ajaxify.data.groups;
-		app.parseAndTranslate('admin/settings/navigation', 'navigation', { navigation: [data] }, function (li) {
-			li = $(translator.unescape(li));
-			el.after(li);
-			el.remove();
+		Benchpress.parse('admin/settings/navigation', 'navigation', { navigation: [data] }, function (li) {
+			translator.translate(li, function (li) {
+				li = $(translator.unescape(li));
+				el.after(li);
+				el.remove();
+			});
 		});
-
-		app.parseAndTranslate('admin/settings/navigation', 'enabled', { enabled: [data] }, function (li) {
-			li = $(translator.unescape(li));
-			$('#enabled').append(li);
-			componentHandler.upgradeDom();
+		Benchpress.parse('admin/settings/navigation', 'enabled', { enabled: [data] }, function (li) {
+			translator.translate(li, function (li) {
+				li = $(translator.unescape(li));
+				$('#enabled').append(li);
+				componentHandler.upgradeDom();
+			});
 		});
 	}
 

diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js
@@ -245,8 +245,7 @@ define('forum/account/edit', [
 
 		modal.find('[data-action="upload-url"]').on('click', function () {
 			modal.modal('hide');
-			app.parseAndTranslate('partials/modals/upload_picture_from_url_modal', {}, function (html) {
-				var uploadModal = $(html);
+			app.parseAndTranslate('partials/modals/upload_picture_from_url_modal', {}, function (uploadModal) {
 				uploadModal.modal('show');
 
 				uploadModal.find('.upload-btn').on('click', function () {

diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
@@ -140,7 +140,6 @@ define('forum/topic/events', [
 				};
 
 				app.parseAndTranslate('partials/topic/post-editor', editData, function (html) {
-					html = $(html);
 					editorEl.replaceWith(html);
 					$('[data-pid="' + data.post.pid + '"] [component="post/editor"] .timeago').timeago();
 					$(window).trigger('action:posts.edited', data);

diff --git a/public/src/client/users.js b/public/src/client/users.js
@@ -112,10 +112,9 @@ define('forum/users', [
 		}
 
 		data.isAdminOrGlobalMod = app.user.isAdmin || app.user.isGlobalMod;
-		app.parseAndTranslate('users', 'users', data, function (translated) {
-			translated = $(translated);
-			$('#users-container').html(translated);
-			translated.find('span.timeago').timeago();
+		app.parseAndTranslate('users', 'users', data, function (html) {
+			$('#users-container').html(html);
+			html.find('span.timeago').timeago();
 			$('[component="user/search/icon"]').addClass('fa-search').removeClass('fa-spinner fa-spin');
 		});
 	}

diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js
@@ -24,7 +24,7 @@ define('alerts', ['translator', 'components'], function (translator, components)
 			if (alert.length) {
 				return updateAlert(alert, params);
 			}
-			alert = $(html);
+			alert = html;
 			alert.fadeIn(200);
 
 			components.get('toaster/tray').prepend(alert);

diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
@@ -14,8 +14,6 @@ define('uploader', ['jquery-form'], function () {
 			button: data.button || '[[global:upload]]',
 			accept: data.accept ? data.accept.replace(/,/g, '&#44; ') : '',
 		}, function (uploadModal) {
-			uploadModal = $(uploadModal);
-
 			uploadModal.modal('show');
 			uploadModal.on('hidden.bs.modal', function () {
 				uploadModal.remove();