diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue index 881df2988..2e79ea100 100644 --- a/src/components/chat_list/chat_list.vue +++ b/src/components/chat_list/chat_list.vue @@ -22,7 +22,7 @@ v-if="sortedChatList.length > 0" class="timeline" > - + diff --git a/src/components/status/status.js b/src/components/status/status.js index 0107bde3c..01d7facfc 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -131,40 +131,41 @@ const Status = { Quote: defineAsyncComponent(() => import('src/components/quote/quote.vue')), StatusActionButtons, }, - props: [ - 'statusoid', - 'replies', + props: { + statusoid: Object, + replies: Array, - 'expandable', - 'focused', - 'highlight', - 'compact', - 'isPreview', - 'noHeading', - 'inlineExpanded', - 'showPinned', - 'inProfile', - 'inConversation', - 'inQuote', - 'profileUserId', - 'simpleTree', - 'showOtherRepliesAsButton', - 'dive', - 'ignoreMute', + expandable: Boolean, + focused: Boolean, + highlight: Boolean, + compact: Boolean, + isPreview: Boolean, + noHeading: Boolean, + inlineExpanded: Boolean, + showPinned: Boolean, + inProfile: Boolean, + inConversation: Boolean, + inQuote: Boolean, - 'controlledThreadDisplayStatus', - 'controlledToggleThreadDisplay', - 'controlledShowingTall', - 'controlledToggleShowingTall', - 'controlledExpandingSubject', - 'controlledToggleExpandingSubject', - 'controlledShowingLongSubject', - 'controlledToggleShowingLongSubject', - 'controlledReplying', - 'controlledToggleReplying', - 'controlledMediaPlaying', - 'controlledSetMediaPlaying', - ], + profileUserId: String, + simpleTree: Boolean, + showOtherRepliesAsButton: Boolean, + dive: Function, + ignoreMute: Boolean, + + controlledThreadDisplayStatus: String, + controlledToggleThreadDisplay: Function, + controlledShowingTall: Boolean, + controlledToggleShowingTall: Function, + controlledExpandingSubject: Boolean, + controlledToggleExpandingSubject: Function, + controlledShowingLongSubject: Boolean, + controlledToggleShowingLongSubject: Function, + controlledReplying: Boolean, + controlledToggleReplying: Function, + controlledMediaPlaying: Boolean, + controlledSetMediaPlaying: Function, + }, emits: ['goto', 'toggleExpanded'], data() { return { diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss index 30e0bd903..755ff9a78 100644 --- a/src/components/tab_switcher/tab_switcher.scss +++ b/src/components/tab_switcher/tab_switcher.scss @@ -56,6 +56,7 @@ .contents { flex: 1 0 auto; min-height: 0; + position: relative; .hidden { display: none; diff --git a/src/components/user_profile/user_profile_admin_view.vue b/src/components/user_profile/user_profile_admin_view.vue index 7e57aae5a..e5118f474 100644 --- a/src/components/user_profile/user_profile_admin_view.vue +++ b/src/components/user_profile/user_profile_admin_view.vue @@ -33,6 +33,7 @@ :statusoid="item" :in-conversation="false" :focused="false" + ignore-mute /> diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js index d5d91e349..de0454240 100644 --- a/src/components/user_reporting_modal/user_reporting_modal.js +++ b/src/components/user_reporting_modal/user_reporting_modal.js @@ -31,7 +31,6 @@ const UserReportingModal = { return !!this.$store.state.users.currentUser }, isOpen() { - console.log(this.reportModal) return this.isLoggedIn && this.reportModal.activated }, userId() { diff --git a/src/stores/reports.js b/src/stores/reports.js index be4ada5e1..e7fa66f7b 100644 --- a/src/stores/reports.js +++ b/src/stores/reports.js @@ -18,12 +18,10 @@ export const useReportsStore = defineStore('reports', { }), actions: { openUserReportingModal({ userId, statusIds = [] }) { - console.log('ASS') const preTickedStatuses = statusIds.map( (id) => window.vuex.state.statuses.allStatusesObject[id], ) const preTickedIds = statusIds - console.log(preTickedStatuses) const statuses = preTickedStatuses.concat( filter( window.vuex.state.statuses.allStatuses,