Refactor isMarkedForDestroy for clarity (#961)

DavyJonesLocker · Dec 15, 2024 · a2089a5 · a2089a5
1 parent ce17c8b
commit a2089a5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/dist/client-side-validations.esm.js b/dist/client-side-validations.esm.js
@@ -661,8 +661,9 @@ var executeValidators = function executeValidators(validatorFunctions, $element,
   return true;
 };
 var isMarkedForDestroy = function isMarkedForDestroy($element) {
-  if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
-    var destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]');
+  var elementName = $element.attr('name');
+  if (/\[([^\]]*?)\]$/.test(elementName)) {
+    var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
     if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
       return true;
     }

diff --git a/dist/client-side-validations.js b/dist/client-side-validations.js
@@ -665,8 +665,9 @@
     return true;
   };
   var isMarkedForDestroy = function isMarkedForDestroy($element) {
-    if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
-      var destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]');
+    var elementName = $element.attr('name');
+    if (/\[([^\]]*?)\]$/.test(elementName)) {
+      var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
       if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
         return true;
       }

diff --git a/src/index.js b/src/index.js
@@ -168,8 +168,10 @@ const executeValidators = (validatorFunctions, $element, validators) => {
 }
 
 const isMarkedForDestroy = ($element) => {
-  if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
-    const destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]')
+  const elementName = $element.attr('name')
+
+  if (/\[([^\]]*?)\]$/.test(elementName)) {
+    const destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]')
 
     if (jQuery(`input[name="${destroyInputName}"]`).val() === '1') {
       return true

diff --git a/vendor/assets/javascripts/rails.validations.js b/vendor/assets/javascripts/rails.validations.js
@@ -665,8 +665,9 @@
     return true;
   };
   var isMarkedForDestroy = function isMarkedForDestroy($element) {
-    if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
-      var destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]');
+    var elementName = $element.attr('name');
+    if (/\[([^\]]*?)\]$/.test(elementName)) {
+      var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
       if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
         return true;
       }