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

NodeBB · Oct 11, 2020 · eab7489 · eab7489
1 parent cd34bfb
commit eab7489
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 47 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/public/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js b/public/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js
diff --git a/src/meta/js.js b/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',
-		'public/vendor/jquery/deserialize/jquery.deserialize.min.js',
+		'node_modules/jquery-deserialize/src/jquery.deserialize.js',
 	],
 
 	// modules listed below are built (/src/modules) so they can be defined anonymously