Tweaks to checkbox & required

Fixes #862 and part of #863
bootboxjs · Nov 7, 2024 · 4403cd0 · 4403cd0
1 parent 5ba822e
commit 4403cd0
Show file tree

Hide file tree

Showing 10 changed files with 6,776 additions and 27 deletions.
diff --git a/bootbox.js b/bootbox.js
@@ -582,20 +582,28 @@
       let value;
 
       if (options.inputType === 'checkbox') {
-        value = input.find('input:checked').map(function () {
-          return $(this).val();
-        }).get();
+        if(options.required === true) {
+          if(input.find('input:checked').length > 0) {         
+            value = input.find('input:checked').map(function () {
+              return $(this).val();
+            }).get();
+          } 
+          else {
+            // prevents button callback from being called if no checkboxes have been checked
+            return false;
+          }
+        }
+        else {
+          value = input.find('input:checked').map(function () {
+            return $(this).val();
+          }).get();
+        }
       } else if (options.inputType === 'radio') {
         value = input.find('input:checked').val();
       }
       else {
         let el = input[0];
 
-        // Clear any previous custom error message
-        if(options.errorMessage) {
-          el.setCustomValidity('');
-        }
-
         if (el.checkValidity && !el.checkValidity()) {
           // If a custom error message was provided, add it now
           if(options.errorMessage){

diff --git a/dist/bootbox.all.js b/dist/bootbox.all.js
@@ -586,19 +586,25 @@
       let value;
 
       if (options.inputType === 'checkbox') {
-        value = input.find('input:checked').map(function() {
-          return $(this).val();
-        }).get();
+        if (options.required === true) {
+          if (input.find('input:checked').length > 0) {
+            value = input.find('input:checked').map(function() {
+              return $(this).val();
+            }).get();
+          } else {
+            // prevents button callback from being called if no checkboxes have been checked
+            return false;
+          }
+        } else {
+          value = input.find('input:checked').map(function() {
+            return $(this).val();
+          }).get();
+        }
       } else if (options.inputType === 'radio') {
         value = input.find('input:checked').val();
       } else {
         let el = input[0];
 
-        // Clear any previous custom error message
-        if (options.errorMessage) {
-          el.setCustomValidity('');
-        }
-
         if (el.checkValidity && !el.checkValidity()) {
           // If a custom error message was provided, add it now
           if (options.errorMessage) {

diff --git a/dist/bootbox.all.min.js b/dist/bootbox.all.min.js
diff --git a/dist/bootbox.js b/dist/bootbox.js
@@ -582,20 +582,28 @@
       let value;
 
       if (options.inputType === 'checkbox') {
-        value = input.find('input:checked').map(function () {
-          return $(this).val();
-        }).get();
+        if(options.required === true) {
+          if(input.find('input:checked').length > 0) {         
+            value = input.find('input:checked').map(function () {
+              return $(this).val();
+            }).get();
+          } 
+          else {
+            // prevents button callback from being called if no checkboxes have been checked
+            return false;
+          }
+        }
+        else {
+          value = input.find('input:checked').map(function () {
+            return $(this).val();
+          }).get();
+        }
       } else if (options.inputType === 'radio') {
         value = input.find('input:checked').val();
       }
       else {
         let el = input[0];
 
-        // Clear any previous custom error message
-        if(options.errorMessage) {
-          el.setCustomValidity('');
-        }
-
         if (el.checkValidity && !el.checkValidity()) {
           // If a custom error message was provided, add it now
           if(options.errorMessage){

diff --git a/dist/bootbox.min.js b/dist/bootbox.min.js
diff --git a/karma-base.conf.js b/karma-base.conf.js
@@ -15,7 +15,7 @@ module.exports = function(params) {
         ['tests/**/*.test.js']
       ),
       exclude: [],
-      reporters: ['dots', 'coverage', 'junit'],
+      reporters: ['dots', 'coverage', 'junit', 'progress', 'html'],
       port: 9876,
       colors: true,
       logLevel: config.LOG_INFO,
@@ -31,6 +31,18 @@ module.exports = function(params) {
 
       junitReporter: {
         outputDir: 'tests/reports'
+      },
+
+      htmlReporter: {
+        outputFile: 'tests/units.html',
+
+        // Optional
+        pageTitle: 'Bootbox',
+        subPageTitle: 'Unit test results, Grouped',
+        groupSuites: true,
+        useCompactStyle: true,
+        useLegacyStyle: false,
+        showOnlyFailed: false
       }
     });
   };

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage": "^2.2.0",
+    "karma-htmlfile-reporter": "^0.3.8",
     "karma-junit-reporter": "^2.0.1",
     "karma-mocha": "^2.0.1",
     "karma-sinon-chai": "^2.0.2",