From 20d21dfe6938d1911f961c9bc97ae241096570da Mon Sep 17 00:00:00 2001
From: Aleen <aleen42@vip.qq.com>
Date: Fri, 9 Jul 2021 12:32:14 +0800
Subject: [PATCH 1/2] CheckboxUncheckedValue should only applies to checkbox

---
 jquery.serializejson.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/jquery.serializejson.js b/jquery.serializejson.js
index ed699eb..c9b5b95 100644
--- a/jquery.serializejson.js
+++ b/jquery.serializejson.js
@@ -24,7 +24,6 @@
     var rCRLF = /\r?\n/g;
     var rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i;
     var rsubmittable = /^(?:input|select|textarea|keygen)/i;
-    var rcheckableType = /^(?:checkbox|radio)$/i;
 
     $.fn.serializeJSON = function (options) {
         var f = $.serializeJSON;
@@ -138,7 +137,7 @@
                 return this.name && // must contain a name attribute
                     !$el.is(":disabled") && // must not be disable (use .is(":disabled") so that fieldset[disabled] works)
                     rsubmittable.test(this.nodeName) && !rsubmitterTypes.test(type) && // only serialize submittable fields (and not buttons)
-                    (this.checked || !rcheckableType.test(type) || f.getCheckboxUncheckedValue($el, opts) != null); // skip unchecked checkboxes (unless using opts)
+                    (this.checked || type !== 'checkbox' || f.getCheckboxUncheckedValue($el, opts) != null); // skip unchecked checkboxes (unless using opts)
 
             }).map(function(_i, el) {
                 var $el = $(this);
@@ -149,7 +148,7 @@
                     return null;
                 }
 
-                if (rcheckableType.test(type) && !this.checked) {
+                if (type === 'checkbox' && !this.checked) {
                     val = f.getCheckboxUncheckedValue($el, opts);
                 }
 

From 5e56868f3c4703fad09c252e1ea8bd69f386fb8d Mon Sep 17 00:00:00 2001
From: Aleen <aleen42@vip.qq.com>
Date: Fri, 9 Jul 2021 12:36:23 +0800
Subject: [PATCH 2/2] Avoid exceptions when checkboxUncheckedValue is set with
 non-string values

---
 jquery.serializejson.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/jquery.serializejson.js b/jquery.serializejson.js
index c9b5b95..5c92abe 100644
--- a/jquery.serializejson.js
+++ b/jquery.serializejson.js
@@ -152,13 +152,9 @@
                     val = f.getCheckboxUncheckedValue($el, opts);
                 }
 
-                if (isArray(val)) {
-                    return $.map(val, function(val) {
-                        return { name: el.name, value: val.replace(rCRLF, "\r\n"), el: el };
-                    } );
-                }
-
-                return { name: el.name, value: val.replace(rCRLF, "\r\n"), el: el };
+                return $.map(isArray(val) ? val : [val], function(val) {
+                    return { name: el.name, value: isString(val) ? val.replace(rCRLF, "\r\n") : val, el: el };
+                } );
 
             }).get();
         },
@@ -333,5 +329,6 @@
     var isObject =          function(obj) { return obj === Object(obj); }; // true for Objects and Arrays
     var isUndefined =       function(obj) { return obj === void 0; }; // safe check for undefined values
     var isValidArrayIndex = function(val) { return /^[0-9]+$/.test(String(val)); }; // 1,2,3,4 ... are valid array indexes
+    var isString          = function(val) { return typeof val === 'string'; };
     var isArray =           Array.isArray || function(obj) { return Object.prototype.toString.call(obj) === "[object Array]"; };
 }));