From 52326e65515317be4815aaef320965313f84d64b Mon Sep 17 00:00:00 2001 From: dave Date: Thu, 14 Mar 2019 11:57:24 -0400 Subject: [PATCH] #436: remove clear & dismiss UI updates --- src/components/notification/notification.js | 3 -- src/components/notification/notification.vue | 5 --- src/components/notifications/notifications.js | 3 -- .../notifications/notifications.vue | 3 +- src/components/status/status.js | 6 +--- src/components/status/status.vue | 3 -- src/i18n/en.json | 2 -- src/modules/statuses.js | 36 +------------------ src/services/api/api.service.js | 25 +------------ 9 files changed, 4 insertions(+), 82 deletions(-) diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index c86f22bb..fe5b7018 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -21,9 +21,6 @@ const Notification = { }, userProfileLink (user) { return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames) - }, - dismiss () { - this.$store.dispatch('dismissNotifications', { id: this.notification.id }) } }, computed: { diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 6e8e9844..fa931fb6 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -3,8 +3,6 @@ v-if="notification.type === 'mention'" :compact="true" :statusoid="notification.status" - isNotification="true" - @dismissNotification="dismiss" >
@@ -40,9 +38,6 @@
- - -
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index 68004d54..e1c53c58 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -55,9 +55,6 @@ const Notifications = { markAsSeen () { this.$store.dispatch('markNotificationsAsSeen') }, - clear () { - this.$store.dispatch('clearNotifications') - }, fetchOlderNotifications () { const store = this.$store const credentials = store.state.users.currentUser.credentials diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 5a5f8ed8..05f51f6c 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -9,8 +9,7 @@
{{$t('timeline.error_fetching')}}
- - +
diff --git a/src/components/status/status.js b/src/components/status/status.js index 4cd26be3..9e18fe15 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -25,8 +25,7 @@ const Status = { 'replies', 'isPreview', 'noHeading', - 'inlineExpanded', - 'isNotification' + 'inlineExpanded' ], data () { return { @@ -366,9 +365,6 @@ const Status = { setMedia () { const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments return () => this.$store.dispatch('setMedia', attachments) - }, - dismissNotification () { - this.$emit('dismissNotification') } }, watch: { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 28a44346..1f6d0325 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -52,9 +52,6 @@ - - -