sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into sw-notification-action

Browse Source
This commit is contained in:
tamaina
2021-08-11 22:53:07 +09:00
parent 10e04a4bbe 9d138aa282
commit 90b735f588
938 changed files with 33452 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/scripts/paging.ts
View File

@@ -201,7 +201,11 @@ export default (opts) => ({
if (isBottom) {
// オーバーフローしたら古いアイテムは捨てる
if (this.items.length >= opts.displayLimit) {
this.items = this.items.slice(-opts.displayLimit);
// このやり方だとVue 3.2以降アニメーションが動かなくなる
//this.items = this.items.slice(-opts.displayLimit);
while (this.items.length >= opts.displayLimit) {
this.items.shift();
}
this.more = true;
}
}
@@ -216,7 +220,11 @@ export default (opts) => ({
// オーバーフローしたら古いアイテムは捨てる
if (this.items.length >= opts.displayLimit) {
this.items = this.items.slice(0, opts.displayLimit);
// このやり方だとVue 3.2以降アニメーションが動かなくなる
//this.items = this.items.slice(0, opts.displayLimit);
while (this.items.length >= opts.displayLimit) {
this.items.pop();
}
this.more = true;
}
} else {

2
src/client/scripts/select-file.ts
View File

@@ -69,7 +69,7 @@ export function selectFile(src: any, label: string | null, multiple = false) {
});
};
os.modalMenu([label ? {
os.popupMenu([label ? {
text: label,
type: 'label'
} : undefined, {

1
src/client/scripts/theme.ts
View File

@@ -23,6 +23,7 @@ export const builtinThemes = [
require('@client/themes/d-dark.json5'),
require('@client/themes/d-persimmon.json5'),
require('@client/themes/d-astro.json5'),
require('@client/themes/d-future.json5'),
require('@client/themes/d-black.json5'),
] as Theme[];