alex/yomichan
1
Fork 0
Code Releases Activity

Add support for generic && and || operations for settings transforms (#1681)

Browse Source
This commit is contained in:
toasted-nutbread 2021-05-16 10:01:57 -04:00 committed by GitHub
parent 916dcd6bab
commit 41ee167dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ext/js/pages/settings/generic-setting-controller.js
View File

@ -159,7 +159,8 @@ class GenericSettingController {
); );
} }
_evaluateSimpleOperation(operation, lhs, rhs) { _evaluateSimpleOperation(operationData, lhs) {
const {op: operation, value: rhs} = operationData;
switch (operation) { switch (operation) {
case '!': return !lhs; case '!': return !lhs;
case '!!': return !!lhs; case '!!': return !!lhs;
@ -169,7 +170,20 @@ class GenericSettingController {
case '<=': return lhs <= rhs; case '<=': return lhs <= rhs;
case '>': return lhs > rhs; case '>': return lhs > rhs;
case '<': return lhs < rhs; case '<': return lhs < rhs;
default: return false; case '&&':
for (const operationData2 of rhs) {
const result = this._evaluateSimpleOperation(operationData2, lhs);
if (!result) { return result; }
}
return true;
case '||':
for (const operationData2 of rhs) {
const result = this._evaluateSimpleOperation(operationData2, lhs);
if (result) { return result; }
}
return false;
default:
return false;
} }
} }
@ -188,7 +202,7 @@ class GenericSettingController {
const {ancestorDistance, selector, condition} = data; const {ancestorDistance, selector, condition} = data;
const relativeElement = this._getRelativeElement(element, ancestorDistance, selector); const relativeElement = this._getRelativeElement(element, ancestorDistance, selector);
if (relativeElement !== null) { if (relativeElement !== null) {
relativeElement.hidden = !this._evaluateSimpleOperation(condition.op, value, condition.value); relativeElement.hidden = !this._evaluateSimpleOperation(condition, value);
} }
return value; return value;
} }
@ -218,11 +232,11 @@ class GenericSettingController {
_conditionalConvert(value, data) { _conditionalConvert(value, data) {
const {cases} = data; const {cases} = data;
if (Array.isArray(cases)) { if (Array.isArray(cases)) {
for (const {op, value: value2, default: isDefault, result} of cases) { for (const caseData of cases) {
if (isDefault === true) { if (caseData.default === true) {
value = result; value = caseData.result;
} else if (this._evaluateSimpleOperation(op, value, value2)) { } else if (this._evaluateSimpleOperation(caseData, value)) {
value = result; value = caseData.result;
break; break;
} }
} }