diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-07-15 08:30:32 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-07-15 08:30:32 +0300 |
| commit | 3cac26a2ac3ecd625b15eea241149e3cc4a2b9d8 (patch) | |
| tree | aeb14926cc022f00301e2f0940dc41f98e941922 /src/components | |
| parent | 7859c5fe4bcd4b6a0a78a84830ccc55693f253f0 (diff) | |
| parent | 297a0c1f7f1a620633b79a40e5545f786a7964f5 (diff) | |
Merge branch 'develop' into fix/preview-styles-polish
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/mobile_nav/mobile_nav.js | 2 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 10 | ||||
| -rw-r--r-- | src/components/timeline/timeline.js | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js index 4613d090..b2b5d264 100644 --- a/src/components/mobile_nav/mobile_nav.js +++ b/src/components/mobile_nav/mobile_nav.js @@ -69,7 +69,7 @@ const MobileNav = { this.$refs.notifications.markAsSeen() }, onScroll ({ target: { scrollTop, clientHeight, scrollHeight } }) { - if (this.$store.getters.mergedConfig.autoLoad && scrollTop + clientHeight >= scrollHeight) { + if (scrollTop + clientHeight >= scrollHeight) { this.$refs.notifications.fetchOlderNotifications() } } diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index f89c0480..7f06d0bd 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -54,16 +54,6 @@ </Checkbox> </li> <li> - <Checkbox v-model="autoLoad"> - {{ $t('settings.autoload') }} - </Checkbox> - </li> - <li> - <Checkbox v-model="hoverPreview"> - {{ $t('settings.reply_link_preview') }} - </Checkbox> - </li> - <li> <Checkbox v-model="emojiReactionsOnTimeline"> {{ $t('settings.emoji_reactions_on_timeline') }} </Checkbox> diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index bac73022..a829bd02 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -148,7 +148,6 @@ const Timeline = { const bodyBRect = document.body.getBoundingClientRect() const height = Math.max(bodyBRect.height, -(bodyBRect.y)) if (this.timeline.loading === false && - this.$store.getters.mergedConfig.autoLoad && this.$el.offsetHeight > 0 && (window.innerHeight + window.pageYOffset) >= (height - 750)) { this.fetchOlderStatuses() |