From a489b46679e48a0181084ce6b51508d93bae7d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tu=C4=9Frul=20Gen=C3=A7o=C4=9Flu?= Date: Sat, 11 Apr 2020 03:23:05 +0300 Subject: [PATCH 1/3] stop pdf share button added --- src/lib/PdfShare.vue | 21 +++++++++++++++++++++ src/lib/VueJanus.vue | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/lib/PdfShare.vue b/src/lib/PdfShare.vue index 88ae936..2e3cb0c 100644 --- a/src/lib/PdfShare.vue +++ b/src/lib/PdfShare.vue @@ -15,6 +15,11 @@ mdi-chevron-left {{pageNumber}} / {{pdf.numPages}} mdi-chevron-right + + + stop pdf share + + @@ -31,6 +36,7 @@ export default { name: "PdfShare", props: { janusInit: Object, + onstop: Function, username: String, myrivid: Number, room: Number, @@ -95,6 +101,21 @@ export default { pluginHandle.send({"message": register}); }, + stop(){ + var unpublish = { "request": "unpublish"}; + this.pluginHandle.send({"message": unpublish}); + + this.pluginHandle.detach(); + + // reset + this.pluginHandle = null; + this.pdf = null; + this.pageNumber = 1; + this.loading = true; + + // callback + this.onstop(); + }, janusPluginError (error) { console.log('error', error) }, diff --git a/src/lib/VueJanus.vue b/src/lib/VueJanus.vue index 9ae7fdd..a5a0a91 100644 --- a/src/lib/VueJanus.vue +++ b/src/lib/VueJanus.vue @@ -6,7 +6,7 @@ stop screen share share a pdf - + Date: Sat, 11 Apr 2020 03:42:35 +0300 Subject: [PATCH 2/3] fixed: stop button was not hidden when screen sharing aborted --- src/lib/VueJanus.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/VueJanus.vue b/src/lib/VueJanus.vue index a5a0a91..0537e0d 100644 --- a/src/lib/VueJanus.vue +++ b/src/lib/VueJanus.vue @@ -194,6 +194,8 @@ } }, onlocalstreamScreen (stream) { + if(!this.screenShareStarted) + this.screenShareStarted=true; this.$refs.ownstreamscreen.srcObject = stream }, shareScreenStart (capture) { @@ -211,7 +213,6 @@ onlocalstream: this.onlocalstreamScreen } ) - this.screenShareStarted=true; }, screenShareStop(){ var srcObject=this.$refs.ownstreamscreen.srcObject; From 1754d57839ccf514484310f0dfd6717409b8d525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tu=C4=9Frul=20Gen=C3=A7o=C4=9Flu?= Date: Sat, 11 Apr 2020 04:10:44 +0300 Subject: [PATCH 3/3] fixed: screen share buttons overflowing from dialog --- src/lib/VueJanus.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/VueJanus.vue b/src/lib/VueJanus.vue index 0537e0d..e68bead 100644 --- a/src/lib/VueJanus.vue +++ b/src/lib/VueJanus.vue @@ -10,7 +10,7 @@ Share whole screen or a window? @@ -19,13 +19,16 @@ Firefox handles screensharing in a different way: are you going to share the whole screen, or would you rather pick a single window/application to share instead? + Share a screen + Share a window + Chrome Extension Error