Skip to content

Commit e847cd3

Browse files
committed
refactor(defaultTheme): rename item-list to entry-list
1 parent 03ee90b commit e847cd3

File tree

3 files changed

+68
-68
lines changed

3 files changed

+68
-68
lines changed

src/tpl/defaultTheme/frontend/index.css

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -391,21 +391,21 @@ html.dragging::before {
391391
padding: 0 0.5em;
392392
}
393393

394-
.item-list {
394+
.entry-list {
395395
margin: 1em;
396396
line-height: 1.2;
397397
}
398398

399-
.item-list li {
399+
.entry-list li {
400400
position: relative;
401401
}
402402

403-
.item-list a {
403+
.entry-list a {
404404
padding: 0.6em;
405405
}
406406

407-
.item-list .detail,
408-
.item-list .delete {
407+
.entry-list .detail,
408+
.entry-list .delete {
409409
display: flex;
410410
flex-flow: row nowrap;
411411
align-items: center;
@@ -417,12 +417,12 @@ html.dragging::before {
417417
padding-right: 2.2em;
418418
}
419419

420-
.item-list .field {
420+
.entry-list .field {
421421
margin: 0 0 0 1em;
422422
flex-shrink: 0;
423423
}
424424

425-
.item-list .name {
425+
.entry-list .name {
426426
flex-grow: 1;
427427
flex-shrink: 1;
428428
flex-basis: 0;
@@ -432,20 +432,20 @@ html.dragging::before {
432432
word-break: break-all;
433433
}
434434

435-
.item-list .size {
435+
.entry-list .size {
436436
white-space: nowrap;
437437
text-align: right;
438438
color: #666;
439439
}
440440

441-
.item-list .time {
441+
.entry-list .time {
442442
color: #999;
443443
text-align: right;
444444
white-space: nowrap;
445445
overflow: hidden;
446446
}
447447

448-
.item-list .delete {
448+
.entry-list .delete {
449449
position: absolute;
450450
top: 0;
451451
right: 0;
@@ -454,7 +454,7 @@ html.dragging::before {
454454
align-items: stretch;
455455
}
456456

457-
.item-list .delete button {
457+
.entry-list .delete button {
458458
border: 0;
459459
color: #800000;
460460
background: none;
@@ -464,23 +464,23 @@ html.dragging::before {
464464
padding: 0.1875em 0.3125em 0.3125em;
465465
}
466466

467-
.item-list .delete button:hover {
467+
.entry-list .delete button:hover {
468468
background: #fee;
469469
}
470470

471-
.item-list .header .detail {
471+
.entry-list .header .detail {
472472
background: #fcfcfc;
473473
}
474474

475-
.item-list .header .field {
475+
.entry-list .header .field {
476476
display: inline-block;
477477
margin: 0;
478478
font-size: 1.5em;
479479
color: #808080;
480480
overflow: hidden;
481481
}
482482

483-
.item-list .header .time {
483+
.entry-list .header .time {
484484
width: 6.5em;
485485
text-align: center;
486486
}
@@ -559,28 +559,28 @@ html.dragging::before {
559559
border-color: #555;
560560
}
561561

562-
.item-list .detail,
563-
.item-list .delete {
562+
.entry-list .detail,
563+
.entry-list .delete {
564564
border-bottom-color: #222;
565565
}
566566

567-
.item-list .size {
567+
.entry-list .size {
568568
color: #999;
569569
}
570570

571-
.item-list .time {
571+
.entry-list .time {
572572
color: #666;
573573
}
574574

575-
.item-list .delete button {
575+
.entry-list .delete button {
576576
color: #f99;
577577
}
578578

579-
.item-list .delete button:hover {
579+
.entry-list .delete button:hover {
580580
background-color: #433;
581581
}
582582

583-
.item-list .header .detail {
583+
.entry-list .header .detail {
584584
background-color: #181818;
585585
}
586586

@@ -590,17 +590,17 @@ html.dragging::before {
590590
}
591591

592592
@media screen and (max-width: 375px) {
593-
.item-list .header .time {
593+
.entry-list .header .time {
594594
width: 4.05em;
595595
}
596596

597-
.item-list .detail .time span {
597+
.entry-list .detail .time span {
598598
display: none;
599599
}
600600
}
601601

602602
@media screen and (max-width: 350px) {
603-
.item-list .detail .time {
603+
.entry-list .detail .time {
604604
display: none;
605605
}
606606
}
@@ -610,12 +610,12 @@ html.dragging::before {
610610
display: none;
611611
}
612612

613-
.item-list li {
613+
.entry-list li {
614614
page-break-inside: avoid;
615615
break-inside: avoid;
616616
}
617617

618-
.item-list li.parent {
618+
.entry-list li.parent {
619619
display: none;
620620
}
621621

src/tpl/defaultTheme/frontend/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ <h3>{{.Trans.UploadLabel}}</h3>
9898
</div>
9999
</div>
100100
{{end -}}
101-
<ul class="item-list{{if .HasDeletable}} has-deletable{{end}}">
101+
<ul class="entry-list{{if .HasDeletable}} has-deletable{{end}}">
102102
{{if not $isSimple -}}
103103
<li class="header">{{$dirSort := .SortState.DirSort}}{{$sortKey := .SortState.Key}}
104104
<span class="detail">

src/tpl/defaultTheme/frontend/index.js

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
const selectorIsNone = '.' + classNone;
1313
const selectorNotNone = `:not(${selectorIsNone})`;
1414
const selectorPathList = '.path-list';
15-
const selectorItemList = '.item-list';
16-
const selectorItem = `li:not(.${classHeader}):not(.parent)`;
17-
const selectorItemIsNone = selectorItem + selectorIsNone;
18-
const selectorItemNotNone = selectorItem + selectorNotNone;
15+
const selectorEntryList = '.entry-list';
16+
const selectorEntry = `li:not(.${classHeader}):not(.parent)`;
17+
const selectorEntryIsNone = selectorEntry + selectorIsNone;
18+
const selectorEntryNotNone = selectorEntry + selectorNotNone;
1919

2020
const Enter = 'Enter';
2121
const Escape = 'Escape';
@@ -46,46 +46,46 @@
4646

4747
const clear = filter.querySelector('button') || document.createElement('button');
4848

49-
const itemList = document.querySelector(selectorItemList)
49+
const entryList = document.querySelector(selectorEntryList);
5050

5151
let timeoutId;
5252
const doFilter = function () {
5353
const filteringText = input.value.trim().toLowerCase();
5454
if (filteringText === filteredText) return;
5555

56-
let items
56+
let entries
5757
if (filteringText) {
5858
clear.style.display = 'block';
5959

6060
let selector
61-
if (filteringText.includes(filteredText)) { // increment search, find in visible items
62-
selector = selectorItemNotNone;
63-
} else if (filteredText.includes(filteringText)) { // decrement search, find in hidden items
64-
selector = selectorItemIsNone;
61+
if (filteringText.includes(filteredText)) { // increment search, find in visible entries
62+
selector = selectorEntryNotNone;
63+
} else if (filteredText.includes(filteringText)) { // decrement search, find in hidden entries
64+
selector = selectorEntryIsNone;
6565
} else {
66-
selector = selectorItem;
66+
selector = selectorEntry;
6767
}
6868
filteredText = filteringText;
6969

70-
items = itemList.querySelectorAll(selector);
71-
items.forEach(item => {
72-
const name = item.querySelector('.name');
70+
entries = entryList.querySelectorAll(selector);
71+
entries.forEach(entry => {
72+
const name = entry.querySelector('.name');
7373
if (matchFilter(name.textContent)) {
74-
if (selector !== selectorItemNotNone) {
75-
item.classList.remove(classNone);
74+
if (selector !== selectorEntryNotNone) {
75+
entry.classList.remove(classNone);
7676
}
7777
} else {
78-
if (selector !== selectorItemIsNone) {
79-
item.classList.add(classNone);
78+
if (selector !== selectorEntryIsNone) {
79+
entry.classList.add(classNone);
8080
}
8181
}
8282
});
83-
} else { // filter cleared, show all items
83+
} else { // filter cleared, show all entries
8484
clear.style.display = '';
8585
filteredText = '';
8686

87-
items = itemList.querySelectorAll(selectorItemIsNone);
88-
items.forEach(item => item.classList.remove(classNone));
87+
entries = entryList.querySelectorAll(selectorEntryIsNone);
88+
entries.forEach(entry => entry.classList.remove(classNone));
8989
}
9090
};
9191

@@ -149,9 +149,9 @@
149149
if (link && link !== lastFocused) lastFocused = link;
150150
}
151151

152-
const itemList = document.body.querySelector(selectorItemList);
153-
itemList.addEventListener('focusin', onFocus);
154-
itemList.addEventListener('click', onFocus);
152+
const entryList = document.body.querySelector(selectorEntryList);
153+
entryList.addEventListener('focusin', onFocus);
154+
entryList.addEventListener('click', onFocus);
155155
window.addEventListener('pageshow', function () {
156156
if (lastFocused && lastFocused !== document.activeElement) {
157157
lastFocused.focus();
@@ -187,12 +187,12 @@
187187
prevChildName = decodeURIComponent(prevChildName);
188188
if (!matchFilter(prevChildName)) return;
189189

190-
const items = Array.from(document.body.querySelectorAll(selectorItemList + '>' + selectorItemNotNone));
190+
const entries = Array.from(document.body.querySelectorAll(selectorEntryList + '>' + selectorEntryNotNone));
191191
const selectorName = '.field.name';
192192
const selectorLink = 'a';
193-
for (let i = 0; i < items.length; i++) {
194-
const item = items[i];
195-
const elName = item.querySelector(selectorName);
193+
for (let i = 0; i < entries.length; i++) {
194+
const entry = entries[i];
195+
const elName = entry.querySelector(selectorName);
196196
if (!elName) continue;
197197

198198
let text = elName.textContent;
@@ -201,7 +201,7 @@
201201
}
202202
if (text !== prevChildName) continue;
203203

204-
const elLink = item.querySelector(selectorLink);
204+
const elLink = entry.querySelector(selectorLink);
205205
if (!elLink) break;
206206

207207
lastFocused = elLink;
@@ -213,8 +213,8 @@
213213

214214
function enableKeyboardNavigate() {
215215
const pathList = document.body.querySelector(selectorPathList);
216-
const itemList = document.body.querySelector(selectorItemList);
217-
if (!pathList && !itemList) {
216+
const entryList = document.body.querySelector(selectorEntryList);
217+
if (!pathList && !entryList) {
218218
return;
219219
}
220220

@@ -369,15 +369,15 @@
369369
switch (e.key) {
370370
case ARROW_DOWN:
371371
if (isToEnd(e)) {
372-
return getLastFocusableSibling(itemList);
372+
return getLastFocusableSibling(entryList);
373373
} else {
374-
return getFocusableSibling(itemList, false);
374+
return getFocusableSibling(entryList, false);
375375
}
376376
case ARROW_UP:
377377
if (isToEnd(e)) {
378-
return getFirstFocusableSibling(itemList);
378+
return getFirstFocusableSibling(entryList);
379379
} else {
380-
return getFocusableSibling(itemList, true);
380+
return getFocusableSibling(entryList, true);
381381
}
382382
case ARROW_RIGHT:
383383
if (isToEnd(e)) {
@@ -394,7 +394,7 @@
394394
}
395395
}
396396
if (!e.ctrlKey && (!e.altKey || IS_MAC_PLATFORM) && !e.metaKey && e.key.length === 1) {
397-
return lookup(itemList, e.key, e.shiftKey);
397+
return lookup(entryList, e.key, e.shiftKey);
398398
}
399399
}
400400

@@ -955,11 +955,11 @@
955955
}
956956

957957
function enableNonRefreshDelete() {
958-
const itemList = document.body.querySelector(selectorItemList);
959-
if (!itemList) return;
960-
if (!itemList.classList.contains('has-deletable')) return;
958+
const entryList = document.body.querySelector(selectorEntryList);
959+
if (!entryList) return;
960+
if (!entryList.classList.contains('has-deletable')) return;
961961

962-
itemList.addEventListener('submit', function (e) {
962+
entryList.addEventListener('submit', function (e) {
963963
if (e.defaultPrevented) return;
964964

965965
const form = e.target;

0 commit comments

Comments
 (0)