Skip to content

Dedicated connection warning icon #3907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danxuliu merged 7 commits into from
Jul 20, 2020
Merged

Dedicated connection warning icon #3907

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ff76e57
Revert "Show warning on the button that could solve the issue"
danxuliu Jul 20, 2020
2e3592f
Revert "Replace quality warning with tooltips on the local media butt…
danxuliu Jul 20, 2020
7ad2486
Revert "Split tooltips for audio, video and screen quality"
danxuliu Jul 20, 2020
7ffffcc
Revert "Dimm own avatar and video when the sender connection quality …
danxuliu Jul 20, 2020
897b801
Dedicated connection warning icon
nickvergessen Jul 15, 2020
238cfd2
Add buttons to disable video and screen share to quality warning tooltip
Jul 17, 2020
b55d0b9
Add button to explicitly dismiss the quality warning tooltip
Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add button to explicitly dismiss the quality warning tooltip 
Instead of showing the quality warning tooltip only if it has not been
recently shown now the quality warning tooltip is always shown when
the quality warning is shown, except if the user has explicitly
dismissed it.

Signed-off-by: Marco Ambrosini <[email protected]>
  • Loading branch information
@danxuliu
Marco Ambrosini authored and danxuliu committed Jul 20, 2020
commit b55d0b9b8cb82325e1001aa906ff5bd08068bea0
20 changes: 18 additions & 2 deletions src/components/CallView/shared/LocalMediaControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,15 @@
:boundaries-element="boundaryElement"
:aria-label="qualityWarningAriaLabel"
trigger="hover"
:open="qualityWarningTooltip.show">
:auto-hide="false"
:open="showQualityWarningTooltip">
<NetworkStrength2Alert
slot="trigger"
fill-color="#e9322d"
title=""
:size="24" />
:size="24"
@mouseover="mouseover = true"
@mouseleave="mouseover = false" />
<div class="hint">
<span>{{ qualityWarningTooltip.content }}</span>
<div class="hint__actions">
Expand All @@ -101,6 +104,11 @@
@click="executeQualityWarningTooltipAction">
{{ qualityWarningTooltip.actionLabel }}
</button>
<button
v-if="!isQualityWarningTooltipDismissed"
@click="isQualityWarningTooltipDismissed = true">
{{ t('spreed', 'Dismiss') }}
</button>
</div>
</div>
</Popover>
Expand Down Expand Up @@ -159,6 +167,8 @@ export default {
screenSharingMenuOpen: false,
splitScreenSharingMenu: false,
boundaryElement: document.querySelector('.main-view'),
isQualityWarningTooltipDismissed: false,
mouseover: false,
}
},

Expand Down Expand Up @@ -288,6 +298,10 @@ export default {
return (this.model.attributes.localScreen || this.splitScreenSharingMenu) ? t('spreed', 'Screensharing options') : t('spreed', 'Enable screensharing')
},

showQualityWarningTooltip() {
return this.qualityWarningTooltip && (!this.isQualityWarningTooltipDismissed || this.mouseover)
},

},

created() {
Expand Down Expand Up @@ -430,8 +444,10 @@ export default {
}
if (this.qualityWarningTooltip.action === 'disableScreenShare') {
this.model.stopSharingScreen()
this.isQualityWarningTooltipDismissed = true
} else if (this.qualityWarningTooltip.action === 'disableVideo') {
this.model.disableVideo()
this.isQualityWarningTooltipDismissed = true
}
},
},
Expand Down
25 changes: 0 additions & 25 deletions src/components/CallView/shared/LocalVideo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ export default {
return {
callAnalyzer: callAnalyzer,
qualityWarningInGracePeriodTimeout: null,
qualityWarningWasRecentlyShownTimeout: null,
}
},

Expand Down Expand Up @@ -207,14 +206,6 @@ export default {
return label
},

// The quality warning tooltip is automatically shown only if the
// quality warning has not been shown in the last minute. Otherwise the
// tooltip is hidden even if the warning is shown, although the tooltip
// can be shown anyway by hovering on the warning.
showQualityWarningTooltip() {
return !this.qualityWarningWasRecentlyShownTimeout
},

qualityWarningTooltip() {
if (!this.showQualityWarning) {
return null
Expand Down Expand Up @@ -251,8 +242,6 @@ export default {
tooltip.action = ''
}

tooltip.show = this.showQualityWarningTooltip

return tooltip
},
},
Expand Down Expand Up @@ -303,20 +292,6 @@ export default {
}, 10000)
},

showQualityWarning: function(showQualityWarning) {
if (showQualityWarning) {
return
}

if (this.qualityWarningWasRecentlyShownTimeout) {
window.clearTimeout(this.qualityWarningWasRecentlyShownTimeout)
}

this.qualityWarningWasRecentlyShownTimeout = window.setTimeout(() => {
this.qualityWarningWasRecentlyShownTimeout = null
}, 60000)
},

},

mounted() {
Expand Down