Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove some unnecessary jquery wrappers

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-11-08 20:26:43 -05:00
parent 978f1ee04f
commit 9f7902efdf
7 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/admin/extend/rewards.js
View File

@@ -140,7 +140,6 @@ define('admin/extend/rewards', [], function () {
}; };
app.parseAndTranslate('admin/extend/rewards', 'active', data, function (li) { app.parseAndTranslate('admin/extend/rewards', 'active', data, function (li) {
li = $(li);
ul.append(li); ul.append(li);
li.find('select').val(''); li.find('select').val('');
}); });

12
public/src/admin/settings/navigation.js
View File

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

3
public/src/client/account/edit.js
View File

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

1
public/src/client/topic/events.js
View File

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

7
public/src/client/users.js
View File

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

2
public/src/modules/alerts.js
View File

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

2
public/src/modules/uploader.js
View File

@@ -14,8 +14,6 @@ define('uploader', ['jquery-form'], function () {
button: data.button || '[[global:upload]]', button: data.button || '[[global:upload]]',
accept: data.accept ? data.accept.replace(/,/g, ', ') : '', accept: data.accept ? data.accept.replace(/,/g, ', ') : '',
}, function (uploadModal) { }, function (uploadModal) {
uploadModal = $(uploadModal);
uploadModal.modal('show'); uploadModal.modal('show');
uploadModal.on('hidden.bs.modal', function () { uploadModal.on('hidden.bs.modal', function () {
uploadModal.remove(); uploadModal.remove();