Skip to content

Commit 5dcb4ac

Browse files
authored
Chore/remove jquery stage ii (#962)
* Remove jQuery from `isMarkedForDestroy` * Remove some jQuery from `executeAllValidators` `element.dataset` and `$element.data` are not the same thing
1 parent a2089a5 commit 5dcb4ac

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

dist/client-side-validations.esm.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -661,17 +661,20 @@ var executeValidators = function executeValidators(validatorFunctions, $element,
661661
return true;
662662
};
663663
var isMarkedForDestroy = function isMarkedForDestroy($element) {
664-
var elementName = $element.attr('name');
664+
var element = $element[0];
665+
var elementName = element.name;
665666
if (/\[([^\]]*?)\]$/.test(elementName)) {
666667
var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
667-
if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
668+
var destroyInputElement = document.querySelector("input[name=\"".concat(destroyInputName, "\"]"));
669+
if (destroyInputElement && destroyInputElement.value === '1') {
668670
return true;
669671
}
670672
}
671673
return false;
672674
};
673675
var executeAllValidators = function executeAllValidators($element, validators) {
674-
if ($element.data('changed') === false || $element.prop('disabled')) {
676+
var element = $element[0];
677+
if ($element.data('changed') === false || element.disabled) {
675678
return;
676679
}
677680
$element.data('changed', false);

dist/client-side-validations.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -665,17 +665,20 @@
665665
return true;
666666
};
667667
var isMarkedForDestroy = function isMarkedForDestroy($element) {
668-
var elementName = $element.attr('name');
668+
var element = $element[0];
669+
var elementName = element.name;
669670
if (/\[([^\]]*?)\]$/.test(elementName)) {
670671
var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
671-
if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
672+
var destroyInputElement = document.querySelector("input[name=\"".concat(destroyInputName, "\"]"));
673+
if (destroyInputElement && destroyInputElement.value === '1') {
672674
return true;
673675
}
674676
}
675677
return false;
676678
};
677679
var executeAllValidators = function executeAllValidators($element, validators) {
678-
if ($element.data('changed') === false || $element.prop('disabled')) {
680+
var element = $element[0];
681+
if ($element.data('changed') === false || element.disabled) {
679682
return;
680683
}
681684
$element.data('changed', false);

src/index.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,14 @@ const executeValidators = (validatorFunctions, $element, validators) => {
168168
}
169169

170170
const isMarkedForDestroy = ($element) => {
171-
const elementName = $element.attr('name')
171+
const element = $element[0]
172+
const elementName = element.name
172173

173174
if (/\[([^\]]*?)\]$/.test(elementName)) {
174175
const destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]')
176+
const destroyInputElement = document.querySelector(`input[name="${destroyInputName}"]`)
175177

176-
if (jQuery(`input[name="${destroyInputName}"]`).val() === '1') {
178+
if (destroyInputElement && destroyInputElement.value === '1') {
177179
return true
178180
}
179181
}
@@ -182,7 +184,8 @@ const isMarkedForDestroy = ($element) => {
182184
}
183185

184186
const executeAllValidators = ($element, validators) => {
185-
if ($element.data('changed') === false || $element.prop('disabled')) {
187+
const element = $element[0]
188+
if ($element.data('changed') === false || element.disabled) {
186189
return
187190
}
188191

vendor/assets/javascripts/rails.validations.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -665,17 +665,20 @@
665665
return true;
666666
};
667667
var isMarkedForDestroy = function isMarkedForDestroy($element) {
668-
var elementName = $element.attr('name');
668+
var element = $element[0];
669+
var elementName = element.name;
669670
if (/\[([^\]]*?)\]$/.test(elementName)) {
670671
var destroyInputName = elementName.replace(/\[([^\]]*?)\]$/, '[_destroy]');
671-
if (jQuery("input[name=\"".concat(destroyInputName, "\"]")).val() === '1') {
672+
var destroyInputElement = document.querySelector("input[name=\"".concat(destroyInputName, "\"]"));
673+
if (destroyInputElement && destroyInputElement.value === '1') {
672674
return true;
673675
}
674676
}
675677
return false;
676678
};
677679
var executeAllValidators = function executeAllValidators($element, validators) {
678-
if ($element.data('changed') === false || $element.prop('disabled')) {
680+
var element = $element[0];
681+
if ($element.data('changed') === false || element.disabled) {
679682
return;
680683
}
681684
$element.data('changed', false);

0 commit comments

Comments
 (0)