Skip to content

fix: Empty Conditional Effects Showing Empty Conditions #2986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CaveMobster merged 2 commits into from
Feb 11, 2025
Merged

fix: Empty Conditional Effects Showing Empty Conditions #2986

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9be937
fix: Empty Conditionals Had Empty Displays
phroggster Feb 10, 2025
bc933ab
chore: ... and fixup some arrow-parens
phroggster Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/gui/app/directives/conditional-effect/conditionDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
$ctrl.leftSideValueDisplay = "[Not Set]";

function getRightSideValueDisplay() {
return $q(async resolve => {
if ($ctrl.condition == null || $ctrl.condition.rightSideValue == null) {
return $q(async (resolve) => {
if ($ctrl.condition == null || $ctrl.condition.rightSideValue == null || $ctrl.condition.rightSideValue === "") {
resolve("[Not Set]");
} else {
const value = await $injector.invoke($ctrl.conditionType.getRightSideValueDisplay, {}, {
Expand All @@ -59,8 +59,8 @@
}

function getLeftSideValueDisplay() {
return $q(async resolve => {
if ($ctrl.condition == null || $ctrl.condition.leftSideValue == null) {
return $q(async (resolve) => {
if ($ctrl.condition == null || $ctrl.condition.leftSideValue == null || $ctrl.condition.leftSideValue === "") {
resolve("[Not Set]");
} else {
const value = await $injector.invoke($ctrl.conditionType.getLeftSideValueDisplay, {}, {
Expand All @@ -72,20 +72,20 @@
}

$ctrl.$onInit = function() {
getRightSideValueDisplay().then(value => {
$ctrl.rightSideValueDisplay = value;
getRightSideValueDisplay().then((value) => {
$ctrl.rightSideValueDisplay = value || "[Not Set]";
});
getLeftSideValueDisplay().then(value => {
$ctrl.leftSideValueDisplay = value;
getLeftSideValueDisplay().then((value) => {
$ctrl.leftSideValueDisplay = value || "[Not Set]";
});
};

$ctrl.$onChanges = function() {
getRightSideValueDisplay().then(value => {
$ctrl.rightSideValueDisplay = value;
getRightSideValueDisplay().then((value) => {
$ctrl.rightSideValueDisplay = value || "[Not Set]";
});
getLeftSideValueDisplay().then(value => {
$ctrl.leftSideValueDisplay = value;
getLeftSideValueDisplay().then((value) => {
$ctrl.leftSideValueDisplay = value || "[Not Set]";
});
};
}
Expand Down