diff --git a/install/package.json b/install/package.json index 169f01c13bef..d4b8cf308e24 100644 --- a/install/package.json +++ b/install/package.json @@ -65,7 +65,9 @@ "html-to-text": "^5.1.1", "ipaddr.js": "^2.0.0", "jquery": "3.5.1", + "jquery-deserialize": "2.0.0-rc1", "jquery-form": "4.3.0", + "jquery-serializeobject": "1.0.0", "jquery-ui": "1.12.1", "jsesc": "3.0.1", "json2csv": "5.0.3", diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 72ec30da247c..6d6228d2cf7e 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -1,13 +1,12 @@ 'use strict'; define('admin/manage/categories', [ - 'vendor/jquery/serializeObject/jquery.ba-serializeobject.min', 'translator', 'benchpress', 'categorySelector', 'api', 'Sortable', -], function (serialize, translator, Benchpress, categorySelector, api, Sortable) { +], function (translator, Benchpress, categorySelector, api, Sortable) { var Categories = {}; var newCategoryId = -1; var sortables; diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index d06554bde86d..5d772181eebb 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -187,35 +187,33 @@ define('forum/groups/details', [ var checkboxes = settingsFormEl.find('input[type="checkbox"][name]'); if (settingsFormEl.length) { - require(['vendor/jquery/serializeObject/jquery.ba-serializeobject.min'], function () { - var settings = settingsFormEl.serializeObject(); - - // Fix checkbox values - checkboxes.each(function (idx, inputEl) { - inputEl = $(inputEl); - if (inputEl.length) { - settings[inputEl.attr('name')] = inputEl.prop('checked'); - } - }); + var settings = settingsFormEl.serializeObject(); - socket.emit('groups.update', { - groupName: groupName, - values: settings, - }, function (err) { - if (err) { - return app.alertError(err.message); - } + // Fix checkbox values + checkboxes.each(function (idx, inputEl) { + inputEl = $(inputEl); + if (inputEl.length) { + settings[inputEl.attr('name')] = inputEl.prop('checked'); + } + }); - if (settings.name) { - var pathname = window.location.pathname; - pathname = pathname.substr(1, pathname.lastIndexOf('/')); - ajaxify.go(pathname + utils.slugify(settings.name)); - } else { - ajaxify.refresh(); - } + socket.emit('groups.update', { + groupName: groupName, + values: settings, + }, function (err) { + if (err) { + return app.alertError(err.message); + } - app.alertSuccess('[[groups:event.updated]]'); - }); + if (settings.name) { + var pathname = window.location.pathname; + pathname = pathname.substr(1, pathname.lastIndexOf('/')); + ajaxify.go(pathname + utils.slugify(settings.name)); + } else { + ajaxify.refresh(); + } + + app.alertSuccess('[[groups:event.updated]]'); }); } }; diff --git a/public/vendor/jquery/deserialize/jquery.deserialize.min.js b/public/vendor/jquery/deserialize/jquery.deserialize.min.js deleted file mode 100644 index a13a08e79ccc..000000000000 --- a/public/vendor/jquery/deserialize/jquery.deserialize.min.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @author Kyle Florence - * @website https://github.com/kflorence/jquery-deserialize/ - * @version 1.2.1 - * - * Dual licensed under the MIT and GPLv2 licenses. - */ -(function(i,b){var f=Array.prototype.push,a=/^(?:radio|checkbox)$/i,e=/\+/g,d=/^(?:option|select-one|select-multiple)$/i,g=/^(?:button|color|date|datetime|datetime-local|email|hidden|month|number|password|range|reset|search|submit|tel|text|textarea|time|url|week)$/i;function c(j){return j.map(function(){return this.elements?i.makeArray(this.elements):this}).filter(":input").get()}function h(j){var k,l={};i.each(j,function(n,m){k=l[m.name];l[m.name]=k===b?m:(i.isArray(k)?k.concat(m):[k,m])});return l}i.fn.deserialize=function(A,l){var y,n,q=c(this),t=[];if(!A||!q.length){return this}if(i.isArray(A)){t=A}else{if(i.isPlainObject(A)){var B,w;for(B in A){i.isArray(w=A[B])?f.apply(t,i.map(w,function(j){return{name:B,value:j}})):f.call(t,{name:B,value:w})}}else{if(typeof A==="string"){var v;A=A.split("&");for(y=0,n=A.length;y