fix: Refresh messages are cool... · feildmaster/UnderScript@c11b8db · GitHub
Skip to content

Commit c11b8db

Browse files
feildmasterfeildmaster
committed
fix: Refresh messages are cool...
1 parent d05a657 commit c11b8db

10 files changed

Lines changed: 34 additions & 35 deletions

‎src/base/battleLog.js‎

Lines changed: 1 addition & 1 deletion

‎src/base/deckScroll.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
settings.register({
22
name: 'Disable Deck Scroll',
33
key: 'underscript.disable.deckScroll',
4-
// TODO: Requires a reload
4+
refresh: () => onPage('Decks'),
55
});
66

77
onPage('Decks', function () {

‎src/base/deckStorage.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
settings.register({
22
name: 'Disable Deck Storage',
33
key: 'underscript.storage.disable',
4-
// TODO: requires reload
4+
refresh: () => onPage('Decks'),
55
});
66

77
settings.register({
88
name: 'Deck Storage Rows',
99
key: 'underscript.storage.rows',
1010
type: 'select',
1111
options: ['1', '2', '3', '4', '5', '6'],
12-
note: () => {
13-
if (onPage('Decks')) {
14-
return 'Will require you to refresh the page';
15-
}
16-
},
12+
refresh: () => onPage('Decks'),
1713
});
1814

1915
onPage('Decks', function deckStorage() {

‎src/base/endTurn.hotkey.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,13 @@ settings.register({
66
name: 'Disable End Turn with Space',
77
key: 'underscript.disable.endTurn.space',
88
disabled: () => settings.value('underscript.disable.endTurn'),
9-
note: () => {
10-
if (typeof gameId === 'undefined') return;
11-
return 'Will require you to refresh the page';
12-
},
9+
refresh: () => typeof gameId !== 'undefined',
1310
});
1411
settings.register({
1512
name: 'Disable End Turn with Middle Click',
1613
key: 'underscript.disable.endTurn.middleClick',
1714
disabled: () => settings.value('underscript.disable.endTurn'),
18-
note: () => {
19-
if (typeof gameId === 'undefined') return;
20-
return 'Will require you to refresh the page';
21-
},
15+
refresh: () => typeof gameId !== 'undefined',
2216
});
2317

2418
eventManager.on("PlayingGame", function bindHotkeys() {

‎src/base/indexLayout.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
settings.register({
22
name: 'Disable Game List Resizing',
33
key: 'underscript.disable.adjustSpectateView',
4+
refresh: () => onPage(''),
45
});
56

67
onPage('', function adjustSpectateView() {

‎src/base/menu.hotkey.js‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
if (typeof BootstrapDialog !== 'undefined') {
2-
hotkeys.push(new Hotkey("Open Menu")
3-
.run((e) => {
4-
if (typeof BootstrapDialog !== 'undefined' && Object.keys(BootstrapDialog.dialogs).length) {
5-
return;
6-
}
7-
if (menu.isOpen()) {
8-
menu.close();
9-
} else {
10-
menu.open();
11-
}
12-
})
13-
.bindKey(27));
14-
}
1+
hotkeys.push(new Hotkey("Open Menu")
2+
.run((e) => {
3+
if (typeof BootstrapDialog !== 'undefined' && Object.keys(BootstrapDialog.dialogs).length) {
4+
return;
5+
}
6+
if (menu.isOpen()) {
7+
menu.close();
8+
} else {
9+
menu.open();
10+
}
11+
})
12+
.bindKey(27));

‎src/base/quickPacks.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
settings.register({
22
name: 'Disable Quick Opening Packs',
33
key: 'underscript.disable.packOpening',
4-
// TODO: Requires reload
4+
refresh: () => onPage('Packs'),
55
});
66

77
onPage('Packs', function quickOpenPack() {

‎src/base/resultToast.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ settings.register({
44
});
55

66
eventManager.on('getResult', function resultToast() {
7+
if (settings.value('underscript.disable.resultToast')) return;
78
const toast = {
89
title: 'Game Finished',
910
text: 'Return Home',
@@ -16,7 +17,7 @@ eventManager.on('getResult', function resultToast() {
1617
document.location.href = "/";
1718
},
1819
};
19-
if (!settings.value('underscript.disable.resultToast') && fn.toast(toast)) {
20+
if (fn.toast(toast)) {
2021
BootstrapDialog.closeAll();
2122
}
2223
});

‎src/base/surrender.menu.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ onPage('Game', () => {
1212
enabled: canSurrender,
1313
top: true,
1414
note: () => {
15-
if (canSurrender()) return null;
15+
if (canSurrender()) return;
1616
return `You can't surrender before turn 5.`;
1717
},
1818
action: () => {

‎src/utils/settings.js‎

Lines changed: 11 additions & 2 deletions

0 commit comments

Comments
 (0)