From 0bce615fe8bd0c219c66c2bc6459444df5f52ff5 Mon Sep 17 00:00:00 2001 From: taehoon Date: Mon, 12 Aug 2019 14:29:11 -0400 Subject: [PATCH] hide ISP if the panel content is empty --- src/App.js | 6 +++++- .../instance_specific_panel/instance_specific_panel.js | 3 --- .../instance_specific_panel/instance_specific_panel.vue | 8 +------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/App.js b/src/App.js index 3624171eda..e9cd5917d3 100644 --- a/src/App.js +++ b/src/App.js @@ -89,7 +89,11 @@ export default { sitename () { return this.$store.state.instance.name }, chat () { return this.$store.state.chat.channel.state === 'joined' }, suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled }, - showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel }, + showInstanceSpecificPanel () { + return this.$store.state.instance.showInstanceSpecificPanel && + !this.$store.state.config.hideISP && + this.$store.state.instance.instanceSpecificPanelContent + }, showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, isMobileLayout () { return this.$store.state.interface.mobileLayout } }, diff --git a/src/components/instance_specific_panel/instance_specific_panel.js b/src/components/instance_specific_panel/instance_specific_panel.js index 9bb5e94550..09e3d0557f 100644 --- a/src/components/instance_specific_panel/instance_specific_panel.js +++ b/src/components/instance_specific_panel/instance_specific_panel.js @@ -2,9 +2,6 @@ const InstanceSpecificPanel = { computed: { instanceSpecificPanelContent () { return this.$store.state.instance.instanceSpecificPanelContent - }, - show () { - return !this.$store.state.config.hideISP } } } diff --git a/src/components/instance_specific_panel/instance_specific_panel.vue b/src/components/instance_specific_panel/instance_specific_panel.vue index a7cf6b4895..7448ca06f5 100644 --- a/src/components/instance_specific_panel/instance_specific_panel.vue +++ b/src/components/instance_specific_panel/instance_specific_panel.vue @@ -1,8 +1,5 @@ - -