Skip to content

Commit b4395d7

Browse files
author
Werner
committed
make sure to only do other button disable if we can do fail checks
1 parent f9313f9 commit b4395d7

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

src/roller.js

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -194,33 +194,35 @@ class LMRTFYRoller extends Application {
194194
_disableButtons(event) {
195195
event.currentTarget.disabled = true;
196196

197-
const buttonSelector = `${event.currentTarget.className}`;
198-
let oppositeSelector = "";
199-
let dataSelector = "";
200-
201-
if (
202-
event.currentTarget.className.indexOf('ability-check') > 0 ||
203-
event.currentTarget.className.indexOf('ability-save') > 0
204-
) {
205-
dataSelector = `[data-ability *= '${event?.currentTarget?.dataset?.ability}']`;
206-
} else {
207-
dataSelector = `[data-skill *= '${event?.currentTarget?.dataset?.skill}']`;
208-
}
197+
if (LMRTFY.canFailChecks) {
198+
const buttonSelector = `${event.currentTarget.className}`;
199+
let oppositeSelector = "";
200+
let dataSelector = "";
201+
202+
if (
203+
event.currentTarget.className.indexOf('ability-check') > 0 ||
204+
event.currentTarget.className.indexOf('ability-save') > 0
205+
) {
206+
dataSelector = `[data-ability *= '${event?.currentTarget?.dataset?.ability}']`;
207+
} else {
208+
dataSelector = `[data-skill *= '${event?.currentTarget?.dataset?.skill}']`;
209+
}
209210

210-
if (event.currentTarget.className.indexOf('fail') > 0) {
211-
oppositeSelector = event.currentTarget.className.substring(0, event.currentTarget.className.indexOf('fail') - 1);
212-
} else {
213-
oppositeSelector = `${event.currentTarget.className}-fail`;
214-
}
211+
if (event.currentTarget.className.indexOf('fail') > 0) {
212+
oppositeSelector = event.currentTarget.className.substring(0, event.currentTarget.className.indexOf('fail') - 1);
213+
} else {
214+
oppositeSelector = `${event.currentTarget.className}-fail`;
215+
}
215216

216-
const enableButton = document.querySelector(`.enable-${buttonSelector}${dataSelector}`);
217-
if (enableButton) {
218-
enableButton.disabled = true;
219-
enableButton.classList.add('disabled-button');
220-
}
217+
const enableButton = document.querySelector(`.enable-${buttonSelector}${dataSelector}`);
218+
if (enableButton) {
219+
enableButton.disabled = true;
220+
enableButton.classList.add('disabled-button');
221+
}
221222

222-
const oppositeButton = document.querySelector(`.${oppositeSelector}${dataSelector}`);
223-
if (oppositeButton) oppositeButton.disabled = true;
223+
const oppositeButton = document.querySelector(`.${oppositeSelector}${dataSelector}`);
224+
if (oppositeButton) oppositeButton.disabled = true;
225+
}
224226
}
225227

226228
async _makeRoll(event, rollMethod, failRoll, ...args) {

0 commit comments

Comments
 (0)