Skip to content

Commit a2089a5

Browse files
authored
Refactor isMarkedForDestroy for clarity (#961)
1 parent ce17c8b commit a2089a5

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

dist/client-side-validations.esm.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,9 @@ var executeValidators = function executeValidators(validatorFunctions, $element,
661661
return true;
662662
};
663663
var isMarkedForDestroy = function isMarkedForDestroy($element) {
664-
if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
665-
var destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]');
664+
var elementName = $element.attr('name');
665+
if (/\[([^\]]*?)\]$/.test(elementName)) {
666+
var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
666667
if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
667668
return true;
668669
}

dist/client-side-validations.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,9 @@
665665
return true;
666666
};
667667
var isMarkedForDestroy = function isMarkedForDestroy($element) {
668-
if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
669-
var destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]');
668+
var elementName = $element.attr('name');
669+
if (/\[([^\]]*?)\]$/.test(elementName)) {
670+
var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
670671
if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
671672
return true;
672673
}

src/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,10 @@ const executeValidators = (validatorFunctions, $element, validators) => {
168168
}
169169

170170
const isMarkedForDestroy = ($element) => {
171-
if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
172-
const destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]')
171+
const elementName = $element.attr('name')
172+
173+
if (/\[([^\]]*?)\]$/.test(elementName)) {
174+
const destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]')
173175

174176
if (jQuery(`input[name="${destroyInputName}"]`).val() === '1') {
175177
return true

vendor/assets/javascripts/rails.validations.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,9 @@
665665
return true;
666666
};
667667
var isMarkedForDestroy = function isMarkedForDestroy($element) {
668-
if ($element.attr('name').search(/\[([^\]]*?)\]$/) >= 0) {
669-
var destroyInputName = $element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]');
668+
var elementName = $element.attr('name');
669+
if (/\[([^\]]*?)\]$/.test(elementName)) {
670+
var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
670671
if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
671672
return true;
672673
}

0 commit comments

Comments
 (0)