From f8ae631d8cf2f8f6383b4fe3a0a6bd4803350344 Mon Sep 17 00:00:00 2001 From: taehoon Date: Thu, 2 May 2019 08:21:02 -0400 Subject: fix notifications div scrolling issue on mobile --- src/components/mobile_nav/mobile_nav.vue | 40 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'src/components/mobile_nav/mobile_nav.vue') diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index 5fa41638..30b1715f 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -1,25 +1,26 @@ @@ -79,6 +81,8 @@ transition-property: transform; transition-duration: 0.25s; transform: translateX(0); + z-index: 1001; + -webkit-overflow-scrolling: touch; &.closed { transform: translateX(100%); -- cgit v1.2.3-70-g09d2 From 6ae3c1cfcf896839f799888e53fc751db952b0f1 Mon Sep 17 00:00:00 2001 From: taehoon Date: Fri, 3 May 2019 07:52:22 -0400 Subject: autoload older notifications when scrolled to the bottom --- src/components/mobile_nav/mobile_nav.js | 5 +++++ src/components/mobile_nav/mobile_nav.vue | 2 +- src/components/notifications/notifications.js | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/components/mobile_nav/mobile_nav.vue') diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js index bc63d2ba..9b341a3b 100644 --- a/src/components/mobile_nav/mobile_nav.js +++ b/src/components/mobile_nav/mobile_nav.js @@ -63,6 +63,11 @@ const MobileNav = { }, markNotificationsAsSeen () { this.$refs.notifications.markAsSeen() + }, + onScroll ({ target: { scrollTop, clientHeight, scrollHeight } }) { + if (this.$store.state.config.autoLoad && scrollTop + clientHeight >= scrollHeight) { + this.$refs.notifications.fetchOlderNotifications() + } } }, watch: { diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index 30b1715f..90707ce7 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -28,7 +28,7 @@ -
+
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index e341212e..5b13b98e 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -52,6 +52,10 @@ const Notifications = { this.$store.dispatch('markNotificationsAsSeen') }, fetchOlderNotifications () { + if (this.loading) { + return + } + const store = this.$store const credentials = store.state.users.currentUser.credentials store.commit('setNotificationsLoading', { value: true }) -- cgit v1.2.3-70-g09d2 From 4526939dae34398ce440dbbcf13f63f7bfe1afa7 Mon Sep 17 00:00:00 2001 From: shpuld Date: Sat, 1 Jun 2019 12:10:00 +0300 Subject: remove console spam --- src/components/mobile_nav/mobile_nav.vue | 2 +- src/components/notifications/notifications.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/components/mobile_nav/mobile_nav.vue') diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index 90707ce7..dcac440a 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -29,7 +29,7 @@
- +
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index 8c97eb04..6c4054fd 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -35,7 +35,6 @@ const Notifications = { return unseenNotificationsFromStore(this.$store) }, visibleNotifications () { - console.log(this.filterMode) return visibleNotificationsFromStore(this.$store, this.filterMode) }, unseenCount () { -- cgit v1.2.3-70-g09d2 From 8d6750d9c2816e33a0444cd978f94009d8b85d47 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 5 Jul 2019 10:17:44 +0300 Subject: eslint --fix --ext .js,.vue src --- src/App.vue | 108 ++- src/components/about/about.vue | 6 +- src/components/attachment/attachment.vue | 100 ++- src/components/autosuggest/autosuggest.vue | 22 +- src/components/avatar_list/avatar_list.vue | 9 +- src/components/basic_user_card/basic_user_card.vue | 41 +- src/components/block_card/block_card.vue | 14 +- src/components/chat_panel/chat_panel.vue | 59 +- src/components/checkbox/checkbox.vue | 9 +- src/components/color_input/color_input.vue | 65 +- src/components/contrast_ratio/contrast_ratio.vue | 52 +- .../conversation-page/conversation-page.vue | 4 +- src/components/conversation/conversation.vue | 27 +- src/components/dialog_modal/dialog_modal.vue | 16 +- src/components/dm_timeline/dm_timeline.vue | 6 +- src/components/emoji-input/emoji-input.vue | 44 +- src/components/export_import/export_import.vue | 33 +- src/components/exporter/exporter.vue | 12 +- src/components/extra_buttons/extra_buttons.vue | 39 +- src/components/favorite_button/favorite_button.vue | 17 +- src/components/features_panel/features_panel.vue | 22 +- src/components/follow_card/follow_card.vue | 19 +- .../follow_request_card/follow_request_card.vue | 14 +- src/components/follow_requests/follow_requests.vue | 9 +- src/components/font_control/font_control.vue | 80 +- .../friends_timeline/friends_timeline.vue | 6 +- src/components/gallery/gallery.vue | 18 +- src/components/image_cropper/image_cropper.vue | 55 +- src/components/importer/importer.vue | 33 +- .../instance_specific_panel.vue | 8 +- src/components/interactions/interactions.vue | 30 +- .../interface_language_switcher.vue | 69 +- src/components/link-preview/link-preview.vue | 18 +- src/components/list/list.vue | 16 +- src/components/login_form/login_form.vue | 114 +-- src/components/media_modal/media_modal.vue | 22 +- src/components/media_upload/media_upload.vue | 30 +- src/components/mentions/mentions.vue | 6 +- src/components/mfa_form/recovery_form.vue | 85 ++- src/components/mfa_form/totp_form.vue | 90 ++- src/components/mobile_nav/mobile_nav.vue | 71 +- .../mobile_post_status_modal.vue | 42 +- .../moderation_tools/moderation_tools.vue | 237 ++++-- src/components/mute_card/mute_card.vue | 14 +- src/components/nav_panel/nav_panel.vue | 17 +- src/components/notification/notification.vue | 97 ++- src/components/notifications/notifications.vue | 66 +- src/components/opacity_input/opacity_input.vue | 58 +- src/components/poll/poll.vue | 39 +- src/components/poll/poll_form.vue | 65 +- .../post_status_form/post_status_form.vue | 363 +++++---- src/components/progress_button/progress_button.vue | 5 +- .../public_and_external_timeline.vue | 6 +- src/components/public_timeline/public_timeline.vue | 6 +- src/components/range_input/range_input.vue | 79 +- src/components/registration/registration.vue | 222 ++++-- src/components/remote_follow/remote_follow.vue | 22 +- src/components/retweet_button/retweet_button.vue | 23 +- src/components/scope_selector/scope_selector.vue | 59 +- src/components/selectable_list/selectable_list.vue | 47 +- src/components/settings/settings.vue | 732 +++++++++++------- src/components/shadow_control/shadow_control.vue | 292 +++++--- src/components/side_drawer/side_drawer.vue | 97 ++- src/components/status/status.vue | 409 +++++++--- src/components/still-image/still-image.vue | 18 +- src/components/style_switcher/preview.vue | 151 ++-- src/components/style_switcher/style_switcher.vue | 825 ++++++++++++++------- src/components/tag_timeline/tag_timeline.vue | 9 +- .../terms_of_service_panel.vue | 6 +- src/components/timeago/timeago.vue | 19 +- src/components/timeline/timeline.vue | 57 +- src/components/user_avatar/user_avatar.vue | 2 +- src/components/user_card/user_card.vue | 360 ++++++--- src/components/user_finder/user_finder.vue | 37 +- src/components/user_panel/user_panel.vue | 20 +- src/components/user_profile/user_profile.vue | 159 ++-- .../user_reporting_modal/user_reporting_modal.vue | 100 ++- src/components/user_search/user_search.vue | 36 +- src/components/user_settings/confirm.vue | 26 +- src/components/user_settings/mfa.vue | 186 +++-- src/components/user_settings/mfa_backup_codes.vue | 24 +- src/components/user_settings/mfa_totp.vue | 56 +- src/components/user_settings/user_settings.vue | 523 +++++++++---- .../video_attachment/video_attachment.vue | 5 +- src/components/who_to_follow/who_to_follow.vue | 9 +- .../who_to_follow_panel/who_to_follow_panel.vue | 17 +- 86 files changed, 4910 insertions(+), 2230 deletions(-) (limited to 'src/components/mobile_nav/mobile_nav.vue') diff --git a/src/App.vue b/src/App.vue index 769e075d..758c9fce 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,53 +1,111 @@