feat: #8734, move deserialize/serialize to package.json

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",

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;

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();
-				var settings = settingsFormEl.serializeObject();
 
-				// Fix checkbox values
+			// Fix checkbox values
-				checkboxes.each(function (idx, inputEl) {
+			checkboxes.each(function (idx, inputEl) {
-					inputEl = $(inputEl);
+				inputEl = $(inputEl);
-					if (inputEl.length) {
+				if (inputEl.length) {
-						settings[inputEl.attr('name')] = inputEl.prop('checked');
+					settings[inputEl.attr('name')] = inputEl.prop('checked');
-					}
+				}
-				});
+			});
 
-				socket.emit('groups.update', {
+			socket.emit('groups.update', {
-					groupName: groupName,
+				groupName: groupName,
-					values: settings,
+				values: settings,
-				}, function (err) {
+			}, function (err) {
-					if (err) {
+				if (err) {
-						return app.alertError(err.message);
+					return app.alertError(err.message);
-					}
+				}
 
-					if (settings.name) {
+				if (settings.name) {
-						var pathname = window.location.pathname;
+					var pathname = window.location.pathname;
-						pathname = pathname.substr(1, pathname.lastIndexOf('/'));
+					pathname = pathname.substr(1, pathname.lastIndexOf('/'));
-						ajaxify.go(pathname + utils.slugify(settings.name));
+					ajaxify.go(pathname + utils.slugify(settings.name));
-					} else {
+				} else {
-						ajaxify.refresh();
+					ajaxify.refresh();
-					}
+				}
 
-					app.alertSuccess('[[groups:event.updated]]');
+				app.alertSuccess('[[groups:event.updated]]');
-				});
 			});
 		}
 	};

public/vendor/jquery/deserialize/jquery.deserialize.min.js

@@ -1,8 +0,0 @@
-/**
- * @author Kyle Florence <kyle[dot]florence[at]gmail[dot]com>
- * @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<n;y++){v=A[y].split("=");f.call(t,{name:decodeURIComponent(v[0]),value:decodeURIComponent(v[1].replace(e,"%20"))})}}}}if(!(n=t.length)){return this}var u,k,x,z,C,o,m,w,p=i.noop,s=i.noop,r={};l=l||{};q=h(q);if(i.isFunction(l)){s=l}else{p=i.isFunction(l.change)?l.change:p;s=i.isFunction(l.complete)?l.complete:s}for(y=0;y<n;y++){u=t[y];C=u.name;w=u.value;if(!(k=q[C])){continue}m=(z=k.length)?k[0]:k;m=(m.type||m.nodeName).toLowerCase();o=null;if(g.test(m)){if(z){x=r[C];k=k[r[C]=(x==b)?0:++x]}p.call(k,(k.value=w))}else{if(a.test(m)){o="checked"}else{if(d.test(m)){o="selected"}}}if(o){if(!z){k=[k];z=1}for(x=0;x<z;x++){u=k[x];if(u.value==w){p.call(u,(u[o]=true)&&w)}}}}s.call(this);return this}})(jQuery);

public/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js

@@ -1,9 +0,0 @@
-/*
- * jQuery serializeObject - v0.2 - 1/20/2010
- * http://benalman.com/projects/jquery-misc-plugins/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,a){$.fn.serializeObject=function(){var b={};$.each(this.serializeArray(),function(d,e){var f=e.name,c=e.value;b[f]=b[f]===a?c:$.isArray(b[f])?b[f].concat(c):[b[f],c]});return b}})(jQuery);

src/meta/js.js

@@ -37,6 +37,7 @@ JS.scripts = {
 		'public/vendor/xregexp/xregexp.js',
 		'public/vendor/xregexp/unicode/unicode-base.js',
 		'node_modules/benchpressjs/build/benchpress.js',
+		'node_modules/jquery-serializeobject/jquery.serializeObject.js',
 		'public/src/utils.js',
 		'public/src/sockets.js',
 		'public/src/app.js',
@@ -84,8 +85,7 @@ JS.scripts = {
 	admin: [
 		'node_modules/material-design-lite/material.js',
 		'public/src/admin/admin.js',
-		'public/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js',
+		'node_modules/jquery-deserialize/src/jquery.deserialize.js',
-		'public/vendor/jquery/deserialize/jquery.deserialize.min.js',
 	],
 
 	// modules listed below are built (/src/modules) so they can be defined anonymously