add a setting to always scroll selected entry to the top of the page, even if it fits entirely on screen (#1088)

commafeed-client/src/app/slices/entries.ts

@@ -45,18 +45,27 @@ const initialState: EntriesState = {
 
 const getEndpoint = (sourceType: EntrySourceType) =>
     sourceType === "category" || sourceType === "tag" ? client.category.getEntries : client.feed.getEntries
-export const loadEntries = createAsyncThunk<Entries, { source: EntrySource; clearSearch: boolean }, { state: RootState }>(
-    "entries/load",
-    async (arg, thunkApi) => {
-        if (arg.clearSearch) thunkApi.dispatch(setSearch(""))
-
-        const state = thunkApi.getState()
-        const endpoint = getEndpoint(arg.source.type)
-        const result = await endpoint(buildGetEntriesPaginatedRequest(state, arg.source, 0))
-        return result.data
+export const loadEntries = createAsyncThunk<
+    Entries,
+    { source: EntrySource; clearSearch: boolean },
+    {
+        state: RootState
     }
-)
-export const loadMoreEntries = createAsyncThunk<Entries, void, { state: RootState }>("entries/loadMore", async (_, thunkApi) => {
+>("entries/load", async (arg, thunkApi) => {
+    if (arg.clearSearch) thunkApi.dispatch(setSearch(""))
+
+    const state = thunkApi.getState()
+    const endpoint = getEndpoint(arg.source.type)
+    const result = await endpoint(buildGetEntriesPaginatedRequest(state, arg.source, 0))
+    return result.data
+})
+export const loadMoreEntries = createAsyncThunk<
+    Entries,
+    void,
+    {
+        state: RootState
+    }
+>("entries/loadMore", async (_, thunkApi) => {
     const state = thunkApi.getState()
     const { source } = state.entries
     const offset =
@@ -74,7 +83,13 @@ const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource,
     tag: source.type === "tag" ? source.id : undefined,
     keywords: state.entries.search,
 })
-export const reloadEntries = createAsyncThunk<void, void, { state: RootState }>("entries/reload", async (arg, thunkApi) => {
+export const reloadEntries = createAsyncThunk<
+    void,
+    void,
+    {
+        state: RootState
+    }
+>("entries/reload", async (arg, thunkApi) => {
     const state = thunkApi.getState()
     thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
 })
@@ -123,15 +138,18 @@ export const markEntriesUpToEntry = createAsyncThunk<void, Entry, { state: RootS
         )
     }
 )
-export const markAllEntries = createAsyncThunk<void, { sourceType: EntrySourceType; req: MarkRequest }, { state: RootState }>(
-    "entries/entry/markAll",
-    async (arg, thunkApi) => {
-        const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
-        await endpoint(arg.req)
-        thunkApi.dispatch(reloadEntries())
-        thunkApi.dispatch(reloadTree())
+export const markAllEntries = createAsyncThunk<
+    void,
+    { sourceType: EntrySourceType; req: MarkRequest },
+    {
+        state: RootState
     }
-)
+>("entries/entry/markAll", async (arg, thunkApi) => {
+    const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
+    await endpoint(arg.req)
+    thunkApi.dispatch(reloadEntries())
+    thunkApi.dispatch(reloadTree())
+})
 export const starEntry = createAsyncThunk("entries/entry/star", (arg: { entry: Entry; starred: boolean }) => {
     client.entry.star({
         id: arg.entry.id,
@@ -175,19 +193,17 @@ export const selectEntry = createAsyncThunk<
     if (arg.scrollToEntry) {
         const entryElement = document.getElementById(Constants.dom.entryId(entry))
         if (entryElement) {
-            const scrollSpeed = state.user.settings?.scrollSpeed
-            thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(true))
-            scrollToEntry(entryElement, scrollSpeed, () => thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(false)))
+            const alwaysScrollToEntry = state.user.settings?.alwaysScrollToEntry
+            const entryEntirelyVisible = Constants.layout.isTopVisible(entryElement) && Constants.layout.isBottomVisible(entryElement)
+            if (alwaysScrollToEntry || !entryEntirelyVisible) {
+                const scrollSpeed = state.user.settings?.scrollSpeed
+                thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(true))
+                scrollToEntry(entryElement, scrollSpeed, () => thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(false)))
+            }
         }
     }
 })
 const scrollToEntry = (entryElement: HTMLElement, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
-    // the entry is entirely visible, no need to scroll
-    if (Constants.layout.isTopVisible(entryElement) && Constants.layout.isBottomVisible(entryElement)) {
-        onScrollEnded()
-        return
-    }
-
     const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
     if (scrollArea) {
         scrollToWithCallback({
@@ -248,7 +264,13 @@ export const selectNextEntry = createAsyncThunk<
         )
     }
 })
-export const tagEntry = createAsyncThunk<void, TagRequest, { state: RootState }>("entries/entry/tag", async (arg, thunkApi) => {
+export const tagEntry = createAsyncThunk<
+    void,
+    TagRequest,
+    {
+        state: RootState
+    }
+>("entries/entry/tag", async (arg, thunkApi) => {
     await client.entry.tag(arg)
     thunkApi.dispatch(reloadTags())
 })

commafeed-client/src/app/slices/user.ts

@@ -80,6 +80,17 @@ export const changeScrollMarks = createAsyncThunk<
     if (!settings) return
     client.user.saveSettings({ ...settings, scrollMarks })
 })
+export const changeAlwaysScrollToEntry = createAsyncThunk<
+    void,
+    boolean,
+    {
+        state: RootState
+    }
+>("settings/alwaysScrollToEntry", (alwaysScrollToEntry, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, alwaysScrollToEntry })
+})
 export const changeSharingSetting = createAsyncThunk<
     void,
     { site: keyof SharingSettings; value: boolean },
@@ -136,6 +147,10 @@ export const userSlice = createSlice({
             if (!state.settings) return
             state.settings.scrollMarks = action.meta.arg
         })
+        builder.addCase(changeAlwaysScrollToEntry.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.alwaysScrollToEntry = action.meta.arg
+        })
         builder.addCase(changeSharingSetting.pending, (state, action) => {
             if (!state.settings) return
             state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
@@ -146,6 +161,7 @@ export const userSlice = createSlice({
                 changeScrollSpeed.fulfilled,
                 changeShowRead.fulfilled,
                 changeScrollMarks.fulfilled,
+                changeAlwaysScrollToEntry.fulfilled,
                 changeSharingSetting.fulfilled
             ),
             () => {

commafeed-client/src/app/types.ts

@@ -233,6 +233,7 @@ export interface Settings {
     customCss?: string
     customJs?: string
     scrollSpeed: number
+    alwaysScrollToEntry: boolean
     sharingSettings: SharingSettings
 }
 

commafeed-client/src/components/settings/DisplaySettings.tsx

@@ -1,7 +1,14 @@
 import { Trans } from "@lingui/macro"
 import { Divider, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
 import { Constants } from "app/constants"
-import { changeLanguage, changeScrollMarks, changeScrollSpeed, changeSharingSetting, changeShowRead } from "app/slices/user"
+import {
+    changeAlwaysScrollToEntry,
+    changeLanguage,
+    changeScrollMarks,
+    changeScrollSpeed,
+    changeSharingSetting,
+    changeShowRead,
+} from "app/slices/user"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { SharingSettings } from "app/types"
 import { locales } from "i18n"
@@ -11,6 +18,7 @@ export function DisplaySettings() {
     const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
     const showRead = useAppSelector(state => state.user.settings?.showRead)
     const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
+    const alwaysScrollToEntry = useAppSelector(state => state.user.settings?.alwaysScrollToEntry)
     const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
     const dispatch = useAppDispatch()
 
@@ -32,6 +40,12 @@ export function DisplaySettings() {
                 onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
             />
 
+            <Switch
+                label={<Trans>Always scroll selected entry to the top of the page, even if it fits entirely on screen</Trans>}
+                checked={alwaysScrollToEntry}
+                onChange={e => dispatch(changeAlwaysScrollToEntry(e.currentTarget.checked))}
+            />
+
             <Switch
                 label={<Trans>Show feeds and categories with no unread entries</Trans>}
                 checked={showRead}

commafeed-client/src/locales/ar/messages.po

@@ -71,6 +71,10 @@ msgstr "إداري"
 msgid "All"
 msgstr "الكل"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "تم إرسال بريد إلكتروني إذا تم تسجيل هذا العنوان. "

commafeed-client/src/locales/ca/messages.po

@@ -71,6 +71,10 @@ msgstr "Administrador"
 msgid "All"
 msgstr "Tot"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "S'ha enviat un correu electrònic si aquesta adreça estava registrada. "

commafeed-client/src/locales/cs/messages.po

@@ -71,6 +71,10 @@ msgstr "Správce"
 msgid "All"
 msgstr "Všechny"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Pokud byla tato adresa zaregistrována, byl odeslán e-mail. "

commafeed-client/src/locales/cy/messages.po

@@ -71,6 +71,10 @@ msgstr "Gweinyddol"
 msgid "All"
 msgstr "Pawb"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Mae e-bost wedi'i anfon os oedd y cyfeiriad hwn wedi'i gofrestru. "

commafeed-client/src/locales/da/messages.po

@@ -71,6 +71,10 @@ msgstr ""
 msgid "All"
 msgstr "Alle"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Der er sendt en e-mail, hvis denne adresse var registreret. "

commafeed-client/src/locales/de/messages.po

@@ -71,6 +71,10 @@ msgstr "Verwaltung"
 msgid "All"
 msgstr "Alle"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Eine E-Mail wurde gesendet, wenn diese Adresse registriert wurde. "

commafeed-client/src/locales/en/messages.po

@@ -71,6 +71,10 @@ msgstr "Admin"
 msgid "All"
 msgstr "All"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "An email has been sent if this address was registered. Check your inbox."

commafeed-client/src/locales/es/messages.po

@@ -71,6 +71,10 @@ msgstr "Administrador"
 msgid "All"
 msgstr "Todo"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Se ha enviado un correo electrónico si se registró esta dirección. "

commafeed-client/src/locales/fa/messages.po

@@ -71,6 +71,10 @@ msgstr "مدیر"
 msgid "All"
 msgstr "همه"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "اگر این آدرس ثبت شده باشد ایمیل ارسال شده است. "

commafeed-client/src/locales/fi/messages.po

@@ -71,6 +71,10 @@ msgstr "Järjestelmänvalvoja"
 msgid "All"
 msgstr "Kaikki"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Sähköposti on lähetetty, jos tämä osoite on rekisteröity. "

commafeed-client/src/locales/fr/messages.po

@@ -71,6 +71,10 @@ msgstr "Administrateur"
 msgid "All"
 msgstr "Tout"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Un e-mail a été envoyé si cette adresse est enregistrée. Vérifiez votre boîte de réception."

commafeed-client/src/locales/gl/messages.po

@@ -71,6 +71,10 @@ msgstr "Administración"
 msgid "All"
 msgstr "Todos"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Enviouse un correo electrónico se este enderezo estaba rexistrado. "

commafeed-client/src/locales/hu/messages.po

@@ -71,6 +71,10 @@ msgstr ""
 msgid "All"
 msgstr "Mind"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "E-mailt küldtünk, ha ez a cím regisztrálva volt. "

commafeed-client/src/locales/id/messages.po

@@ -71,6 +71,10 @@ msgstr ""
 msgid "All"
 msgstr "Semua"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Email telah dikirim jika alamat ini terdaftar. "

commafeed-client/src/locales/it/messages.po

@@ -71,6 +71,10 @@ msgstr "Ammin"
 msgid "All"
 msgstr "Tutto"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "È stata inviata un'e-mail se questo indirizzo è stato registrato. "

commafeed-client/src/locales/ja/messages.po

@@ -71,6 +71,10 @@ msgstr "管理人"
 msgid "All"
 msgstr "全員"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "このアドレスが登録されていれば、メールが送信されました。"

commafeed-client/src/locales/ko/messages.po

@@ -71,6 +71,10 @@ msgstr "관리자"
 msgid "All"
 msgstr "전체"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "이 주소가 등록된 경우 이메일이 전송되었습니다. "

commafeed-client/src/locales/ms/messages.po

@@ -71,6 +71,10 @@ msgstr "Pentadbir"
 msgid "All"
 msgstr "Semua"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "E-mel telah dihantar jika alamat ini didaftarkan. "

commafeed-client/src/locales/nb/messages.po

@@ -71,6 +71,10 @@ msgstr ""
 msgid "All"
 msgstr "Alle"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "En e-post er sendt hvis denne adressen var registrert. "

commafeed-client/src/locales/nl/messages.po

@@ -71,6 +71,10 @@ msgstr "Beheerder"
 msgid "All"
 msgstr "Alles"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Er is een e-mail verzonden als dit adres is geregistreerd. "

commafeed-client/src/locales/nn/messages.po

@@ -71,6 +71,10 @@ msgstr ""
 msgid "All"
 msgstr "Alle"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "En e-post er sendt hvis denne adressen var registrert. "

commafeed-client/src/locales/pl/messages.po

@@ -71,6 +71,10 @@ msgstr "Administracja"
 msgid "All"
 msgstr "Wszystkie"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "E-mail został wysłany, jeśli ten adres został zarejestrowany. "

commafeed-client/src/locales/pt/messages.po

@@ -71,6 +71,10 @@ msgstr "Administrador"
 msgid "All"
 msgstr "Todos"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Um email foi enviado se este endereço foi registrado. "

commafeed-client/src/locales/ru/messages.po

@@ -71,6 +71,10 @@ msgstr "Админ"
 msgid "All"
 msgstr "Все"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Электронное письмо было отправлено, если этот адрес был зарегистрирован. "

commafeed-client/src/locales/sk/messages.po

@@ -71,6 +71,10 @@ msgstr "Správca"
 msgid "All"
 msgstr "Všetky"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "E-mail bol odoslaný, ak bola táto adresa zaregistrovaná. "

commafeed-client/src/locales/sv/messages.po

@@ -71,6 +71,10 @@ msgstr ""
 msgid "All"
 msgstr "Alla"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Ett e-postmeddelande har skickats om denna adress var registrerad. "

commafeed-client/src/locales/tr/messages.po

@@ -71,6 +71,10 @@ msgstr "Yönetici"
 msgid "All"
 msgstr "Tümü"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "Bu adres kayıtlıysa bir e-posta gönderildi. "

commafeed-client/src/locales/zh/messages.po

@@ -71,6 +71,10 @@ msgstr "管理员"
 msgid "All"
 msgstr "全部"
 
+#: src/components/settings/DisplaySettings.tsx
+msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
+msgstr ""
+
 #: src/pages/auth/PasswordRecoveryPage.tsx
 msgid "An email has been sent if this address was registered. Check your inbox."
 msgstr "如果此地址已注册，则已发送电子邮件。"

commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java

@@ -65,6 +65,8 @@ public class UserSettings extends AbstractModel {
 	@Column(name = "scroll_speed")
 	private int scrollSpeed;
 
+	private boolean alwaysScrollToEntry;
+
 	private boolean email;
 	private boolean gmail;
 	private boolean facebook;

commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java

@@ -35,6 +35,9 @@ public class Settings implements Serializable {
 	@ApiModelProperty(value = "user's preferred scroll speed when navigating between entries", required = true)
 	private int scrollSpeed;
 
+	@ApiModelProperty(value = "always scroll selected entry to the top of the page, even if it fits entirely on screen", required = true)
+	private boolean alwaysScrollToEntry;
+
 	@ApiModelProperty(value = "sharing settings", required = true)
 	private SharingSettings sharingSettings = new SharingSettings();
 

commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java

@@ -103,6 +103,7 @@ public class UserREST {
 			s.setCustomJs(settings.getCustomJs());
 			s.setLanguage(settings.getLanguage());
 			s.setScrollSpeed(settings.getScrollSpeed());
+			s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry());
 		} else {
 			s.setReadingMode(ReadingMode.unread.name());
 			s.setReadingOrder(ReadingOrder.desc.name());
@@ -120,6 +121,7 @@ public class UserREST {
 			s.setScrollMarks(true);
 			s.setLanguage("en");
 			s.setScrollSpeed(400);
+			s.setAlwaysScrollToEntry(false);
 		}
 		return Response.ok(s).build();
 	}
@@ -145,6 +147,7 @@ public class UserREST {
 		s.setCustomJs(settings.getCustomJs());
 		s.setLanguage(settings.getLanguage());
 		s.setScrollSpeed(settings.getScrollSpeed());
+		s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry());
 
 		s.setEmail(settings.getSharingSettings().isEmail());
 		s.setGmail(settings.getSharingSettings().isGmail());

commafeed-server/src/main/resources/changelogs/db.changelog-3.8.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+				   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+	<changeSet id="always-scroll-to-entry" author="athou">
+		<addColumn tableName="USERSETTINGS">
+			<column name="alwaysScrollToEntry" type="BOOLEAN" defaultValueBoolean="false">
+				<constraints nullable="false" />
+			</column>
+		</addColumn>
+	</changeSet>
+
+</databaseChangeLog>

commafeed-server/src/main/resources/migrations.xml

@@ -20,5 +20,6 @@
 	<include file="changelogs/db.changelog-3.2.xml" />
 	<include file="changelogs/db.changelog-3.5.xml" />
 	<include file="changelogs/db.changelog-3.6.xml" />
+	<include file="changelogs/db.changelog-3.8.xml" />
 
 </databaseChangeLog>