Skip to content

Commit 587f5e8

Browse files
committed
Minor code fixes
1 parent be973d3 commit 587f5e8

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

com.woltlab.wcf/templates/shared_categorizedSingleSelectionFormField.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<div class="itemListFilter" id="{$field->getPrefixedId()}_list">
1616
<div class="inputAddon">
17-
<input type="text" class="long" placeholder="{lang}wcf.global.filter.placeholder{/lang}" />
17+
<input type="text" class="long" placeholder="{lang}wcf.global.filter.placeholder{/lang}">
1818
<button type="button" class="button clearButton inputSuffix disabled jsTooltip" title="{lang}wcf.global.filter.button.clear{/lang}">{icon name="xmark" solid=true}</button>
1919
</div>
2020
<ul class="scrollableCheckboxList">
@@ -32,9 +32,9 @@
3232
*}> <span>{unsafe:$__fieldNestedOption[label]}</span>
3333
</label>
3434
{else}
35-
<button type="button" class="pointer">{icon name="chevron-down"} {unsafe:$__fieldNestedOption[label]}</button>
35+
<button type="button">{icon name="chevron-down"} {unsafe:$__fieldNestedOption[label]}</button>
3636
{/if}
3737
</li>
3838
{/foreach}
3939
</ul>
40-
</div>
40+
</div>

ts/WoltLabSuite/Core/Component/ItemList/Categorized.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ import { innerError, show, hide, isHidden } from "WoltLabSuite/Core/Dom/Util";
1111
import { getPhrase } from "WoltLabSuite/Core/Language";
1212
import { escapeRegExp } from "WoltLabSuite/Core/StringUtil";
1313

14-
interface Item {
14+
type Item = {
1515
element: HTMLLIElement;
1616
span: HTMLSpanElement;
1717
text: string;
18-
}
18+
};
1919

20-
interface Category {
20+
type Category = {
2121
items: Item[];
2222
element: HTMLLIElement;
23-
}
23+
};
2424

2525
export class CategorizedItemList {
26-
#container: HTMLElement;
27-
#elementList: HTMLUListElement;
28-
#input: HTMLInputElement;
26+
readonly #container: HTMLElement;
27+
readonly #elementList: HTMLUListElement;
28+
readonly #input: HTMLInputElement;
2929
#value: string = "";
30-
#clearButton: HTMLButtonElement;
30+
readonly #clearButton: HTMLButtonElement;
3131
#categories: Category[] = [];
32-
#fragment: DocumentFragment;
32+
readonly #fragment: DocumentFragment;
3333

3434
constructor(elementId: string) {
3535
this.#fragment = document.createDocumentFragment();
@@ -72,8 +72,8 @@ export class CategorizedItemList {
7272

7373
category.items.push({
7474
element: li,
75-
span: li.querySelector<HTMLSpanElement>("span")!,
76-
text: li.innerText.trim(),
75+
span: li.querySelector("span")!,
76+
text: li.textContent!.trim(),
7777
});
7878
} else {
7979
const items: Item[] = [];
@@ -96,7 +96,7 @@ export class CategorizedItemList {
9696
const isOpen = !this.#categoryIsOpen(li);
9797
li.dataset.open = isOpen ? "true" : "false";
9898

99-
li.querySelector<FaIcon>("fa-icon")!.setIcon(isOpen ? "chevron-down" : "chevron-right");
99+
li.querySelector("fa-icon")!.setIcon(isOpen ? "chevron-down" : "chevron-right");
100100

101101
this.#showItems({
102102
items: items,

wcfsetup/install/files/js/WoltLabSuite/Core/Component/ItemList/Categorized.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/lib/action/ConditionAddAction.class.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,18 @@ private function getOptions(AbstractConditionProvider $provider): array
114114

115115
if (!isset($grouped[$category])) {
116116
$grouped[$category] = [
117-
"items" => [],
118-
"label" => WCF::getLanguage()->get('wcf.condition.category.' . $category),
117+
'items' => [],
118+
'label' => WCF::getLanguage()->get('wcf.condition.category.' . $category),
119119
];
120120
}
121121

122-
$grouped[$category]["items"][$key] = WCF::getLanguage()->get($label);
122+
$grouped[$category]['items'][$key] = WCF::getLanguage()->get($label);
123123
}
124124

125125
$collator = new \Collator(WCF::getLanguage()->getLocale());
126126

127127
foreach ($grouped as &$category) {
128-
\uasort($category["items"], static function ($labelA, $labelB) use ($collator) {
128+
\uasort($category['items'], static function ($labelA, $labelB) use ($collator) {
129129
return $collator->compare($labelA, $labelB);
130130
});
131131
}
@@ -141,11 +141,11 @@ private function getOptions(AbstractConditionProvider $provider): array
141141
$options[] = [
142142
'depth' => 0,
143143
'isSelectable' => false,
144-
'label' => $category["label"],
144+
'label' => $category['label'],
145145
'value' => $categoryKey,
146146
];
147147

148-
foreach ($category["items"] as $key => $label) {
148+
foreach ($category['items'] as $key => $label) {
149149
$options[] = [
150150
'depth' => 1,
151151
'isSelectable' => true,

0 commit comments

Comments
 (0)