diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-12-17 09:08:25 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-12-17 09:08:25 +0900 |
| commit | 79cbbcfe0f3c01982483c555cb54f5ceb9bf14e6 (patch) | |
| tree | c3130c188eb98f6d78b8b7ffaa24eaf9355aa598 /packages | |
| parent | Update example.yml (diff) | |
| parent | Update CHANGELOG.md (diff) | |
| download | misskey-79cbbcfe0f3c01982483c555cb54f5ceb9bf14e6.tar.gz misskey-79cbbcfe0f3c01982483c555cb54f5ceb9bf14e6.tar.bz2 misskey-79cbbcfe0f3c01982483c555cb54f5ceb9bf14e6.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/pages/settings/security.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/preferences/manager.ts | 21 | ||||
| -rw-r--r-- | packages/misskey-js/package.json | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/packages/frontend/src/pages/settings/security.vue b/packages/frontend/src/pages/settings/security.vue index bc77c1f0af..30f97b095e 100644 --- a/packages/frontend/src/pages/settings/security.vue +++ b/packages/frontend/src/pages/settings/security.vue @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only <SearchMarker :keywords="['signin', 'login', 'history', 'log']"> <FormSection> <template #label><SearchLabel>{{ i18n.ts.signinHistory }}</SearchLabel></template> - <MkPagination :paginator="paginator" withControl> + <MkPagination :paginator="paginator" withControl :forceDisableInfiniteScroll="true"> <template #default="{items}"> <div> <div v-for="item in items" :key="item.id" v-panel class="timnmucd"> diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts index 5949ee71eb..13ba0000e4 100644 --- a/packages/frontend/src/preferences/manager.ts +++ b/packages/frontend/src/preferences/manager.ts @@ -257,20 +257,23 @@ export class PreferencesManager extends EventEmitter<PreferencesManagerEvents> { this.rewriteRawState(key, v); - this.emit('committed', { - key, - value: v, - oldValue: this.s[key], - }); - const record = this.getMatchedRecordOf(key); + const _save = () => { + this.save(); + this.emit('committed', { + key, + value: v, + oldValue: this.s[key], + }); + }; + if (parseScope(record[0]).account == null && isAccountDependentKey(key) && currentAccount != null) { this.profile.preferences[key].push([makeScope({ server: host, account: currentAccount.id, }), v, {}]); - this.save(); + _save(); return; } @@ -278,12 +281,12 @@ export class PreferencesManager extends EventEmitter<PreferencesManagerEvents> { this.profile.preferences[key].push([makeScope({ server: host, }), v, {}]); - this.save(); + _save(); return; } record[1] = v; - this.save(); + _save(); if (record[2].sync) { // awaitの必要なし diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 74308d5e56..68609f15d8 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2025.12.2-alpha.0", + "version": "2025.12.2-beta.1", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", |