diff options
author | Zéro~Informatique | 2022-07-26 08:44:34 +0200 |
---|---|---|
committer | pacien | 2022-09-03 01:30:42 +0200 |
commit | 00510820a2794efcadbc83f7f8b54318fe198ecb (patch) | |
tree | a894d99c22a601197869c7a6928d40bb4ae2c392 /viewer/src/services/itemComparators.ts | |
parent | 88aa098c07e067f9f737fbeba1f52a9bd5042e53 (diff) | |
download | ldgallery-00510820a2794efcadbc83f7f8b54318fe198ecb.tar.gz |
viewer: migrate to vue 3, general refactoring and cleanup
Non-exhaustive list of fixes and improvements done at the same time:
- html default background to grey (avoids white flash during init)
- unified links behavior
- added more theme variables
- removed the flex-expand transition (it wasn't working) and replaced it
with a slide
- fixed LdLoading not centered on the content
- title on removable tags
- fixed an issue with encoded URI from vue-router
- unified Item resource URLs
- removed the iframe for PlainTextViewer (it wasn't working properly)
and replaced it with a pre
- fixed clear and search buttons tabindex
- fixed the information panel bumping up during the fade animation of
tag's dropdown
- fixed some focus outlines not appearing correctly
- moved CSS variables to the :root context
- Code cleaning
GitHub: closes #217
GitHub: closes #300
GitHub: closes #297
GitHub: closes #105
GitHub: closes #267
GitHub: closes #275
GitHub: closes #228
GitHub: closes #215
GitHub: closes #112
Diffstat (limited to 'viewer/src/services/itemComparators.ts')
-rw-r--r-- | viewer/src/services/itemComparators.ts | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/viewer/src/services/itemComparators.ts b/viewer/src/services/itemComparators.ts deleted file mode 100644 index aceff79..0000000 --- a/viewer/src/services/itemComparators.ts +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | /* ldgallery - A static generator which turns a collection of tagged | ||
2 | -- pictures into a searchable web gallery. | ||
3 | -- | ||
4 | -- Copyright (C) 2019-2020 Guillaume FOUET | ||
5 | -- | ||
6 | -- This program is free software: you can redistribute it and/or modify | ||
7 | -- it under the terms of the GNU Affero General Public License as | ||
8 | -- published by the Free Software Foundation, either version 3 of the | ||
9 | -- License, or (at your option) any later version. | ||
10 | -- | ||
11 | -- This program is distributed in the hope that it will be useful, | ||
12 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | -- GNU Affero General Public License for more details. | ||
15 | -- | ||
16 | -- You should have received a copy of the GNU Affero General Public License | ||
17 | -- along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
18 | */ | ||
19 | import { Item, ItemSortStr } from "@/@types/gallery"; | ||
20 | import i18n from "@/plugins/i18n"; | ||
21 | import { TranslateResult } from "vue-i18n"; | ||
22 | |||
23 | export type ItemComparator = (left: Item, right: Item) => number; | ||
24 | export type ItemSort = { text: TranslateResult; fn: ItemComparator }; | ||
25 | |||
26 | export default class ItemComparators { | ||
27 | static readonly ITEM_SORTS: Record<ItemSortStr, ItemSort> = { | ||
28 | title_asc: { | ||
29 | text: i18n.t("command.sort.byTitleAsc"), | ||
30 | fn: ItemComparators.chain(ItemComparators.sortByTitleAsc, ItemComparators.sortByPathAsc), | ||
31 | }, | ||
32 | date_asc: { | ||
33 | text: i18n.t("command.sort.byDateAsc"), | ||
34 | fn: ItemComparators.chain(ItemComparators.sortByDateAsc, ItemComparators.sortByPathAsc), | ||
35 | }, | ||
36 | date_desc: { | ||
37 | text: i18n.t("command.sort.byDateDesc"), | ||
38 | fn: ItemComparators.reverse(ItemComparators.chain(ItemComparators.sortByDateAsc, ItemComparators.sortByPathAsc)), | ||
39 | }, | ||
40 | }; | ||
41 | |||
42 | static readonly DEFAULT = ItemComparators.ITEM_SORTS.date_asc; | ||
43 | |||
44 | static sortByPathAsc(left: Item, right: Item): number { | ||
45 | return left.path.localeCompare(right.path, undefined, { | ||
46 | sensitivity: "base", | ||
47 | ignorePunctuation: true, | ||
48 | numeric: true, | ||
49 | }); | ||
50 | } | ||
51 | |||
52 | static sortByTitleAsc(left: Item, right: Item): number { | ||
53 | return left.title.localeCompare(right.title, undefined, { | ||
54 | sensitivity: "base", | ||
55 | ignorePunctuation: true, | ||
56 | numeric: true, | ||
57 | }); | ||
58 | } | ||
59 | |||
60 | static sortByDateAsc(left: Item, right: Item): number { | ||
61 | return left.datetime.localeCompare(right.datetime); // TODO: handle timezones | ||
62 | } | ||
63 | |||
64 | static reverse(fn: ItemComparator): ItemComparator { | ||
65 | return (l, r) => -fn(l, r); | ||
66 | } | ||
67 | |||
68 | static chain(primary: ItemComparator, tieBreaker: ItemComparator): ItemComparator { | ||
69 | return (l, r) => { | ||
70 | const primaryComparison = primary(l, r); | ||
71 | return primaryComparison !== 0 ? primaryComparison : tieBreaker(l, r); | ||
72 | }; | ||
73 | } | ||
74 | } | ||