noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1106 from thecodingmachine/safari_fix

Browse Source 
Fixing Safari on MacOS compatibility
This commit is contained in:
David Négrier 2021-06-03 10:50:30 +02:00 committed by GitHub
commit 9e42d9d05b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/Components/EnableCamera/HorizontalSoundMeterWidget.svelte
View File

@ -10,9 +10,11 @@
let timeout;
const soundMeter = new SoundMeter();
let display = false;
$: {
if (stream && stream.getAudioTracks().length > 0) {
display = true;
soundMeter.connectToSource(stream, new AudioContext());
if (timeout) {
@ -28,6 +30,8 @@
}
}, 100);
} else {
display = false;
}
}
@ -53,7 +57,7 @@
</script>
<div class="horizontal-sound-meter" class:active={stream?.getAudioTracks().length > 0}>
<div class="horizontal-sound-meter" class:active={display}>
{#each [...Array(NB_BARS).keys()] as i}
<div style={color(i, volume)}></div>
{/each}

6
front/src/Components/SoundMeterWidget.svelte
View File

@ -10,9 +10,11 @@
let timeout;
const soundMeter = new SoundMeter();
let display = false;
$: {
if (stream && stream.getAudioTracks().length > 0) {
display = true;
soundMeter.connectToSource(stream, new AudioContext());
if (timeout) {
@ -28,6 +30,8 @@
}
}, 100);
} else {
display = false;
}
}
@ -40,7 +44,7 @@
</script>
<div class="sound-progress" class:active={stream?.getAudioTracks().length > 0}>
<div class="sound-progress" class:active={display}>
<span class:active={volume > 1}></span>
<span class:active={volume > 2}></span>
<span class:active={volume > 3}></span>

4
front/src/Stores/MediaStore.ts
View File

@ -418,13 +418,15 @@ export const localStreamStore = derived<Readable<MediaStreamConstraints>, LocalS
error: new Error('Unable to access your camera or microphone. You need to use a HTTPS connection.'),
constraints
});
return;
} else {
//throw new Error('Unable to access your camera or microphone. Your browser is too old.');
set({
type: 'error',
error: new Error('Unable to access your camera or microphone. Your browser is too old.'),
error: new Error('Unable to access your camera or microphone. Your browser is too old. Please consider upgrading your browser or try using a recent version of Chrome.'),
constraints
});
return;
}
}

26
front/src/WebRtc/MediaManager.ts
View File

@ -440,12 +440,32 @@ export class MediaManager {
public getNotification(){
//Get notification
if (!DISABLE_NOTIFICATIONS && window.Notification && Notification.permission !== "granted") {
Notification.requestPermission().catch((err) => {
console.error(`Notification permission error`, err);
});
if (this.checkNotificationPromise()) {
Notification.requestPermission().catch((err) => {
console.error(`Notification permission error`, err);
});
} else {
Notification.requestPermission();
}
}
}
/**
* Return true if the browser supports the modern version of the Notification API (which is Promise based) or false
* if we are on Safari...
*
* See https://developer.mozilla.org/en-US/docs/Web/API/Notifications_API/Using_the_Notifications_API
*/
private checkNotificationPromise(): boolean {
try {
Notification.requestPermission().then();
} catch(e) {
return false;
}
return true;
}
public createNotification(userName: string){
if(this.focused){
return;