From 8f666427b6a55f21cf7ddd5f4c0dbb4f6efa1603 Mon Sep 17 00:00:00 2001 From: Ben Arc Date: Tue, 20 Apr 2021 14:05:08 +0100 Subject: [PATCH] screen share tweaks --- .../copilot/templates/copilot/compose.html | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/lnbits/extensions/copilot/templates/copilot/compose.html b/lnbits/extensions/copilot/templates/copilot/compose.html index def2ba9ed..ae6d6342f 100644 --- a/lnbits/extensions/copilot/templates/copilot/compose.html +++ b/lnbits/extensions/copilot/templates/copilot/compose.html @@ -1,14 +1,13 @@ {% extends "public.html" %} {% block page %} -
+ @@ -111,7 +110,7 @@ return Quasar.utils.openURL(url) }, initCamera() { - var video = document.querySelector('#videoElement') + var video = document.querySelector('#videoCamera') if (navigator.mediaDevices.getUserMedia) { navigator.mediaDevices @@ -124,6 +123,17 @@ }) } }, + initScreenShare() { + var video = document.querySelector('#videoScreen') + navigator.mediaDevices + .getDisplayMedia({video: true}) + .then(function (stream) { + video.srcObject = stream + }) + .catch(function (err0r) { + console.log('Something went wrong!') + }) + }, getPrice: function () { self = this if ('{{ copilot.show_price }}' != 'None') { @@ -150,7 +160,7 @@ self.connection.send('') self.counter++ if (self.counter % 20 === 0) { - this.getPrice + self.getPrice() console.log('test') } }, 1000) @@ -251,22 +261,11 @@ } if (res[1] == 'true') { document.getElementById('videoElement').style.width = '20%' - async function startCapture(displayMediaOptions) { - let captureStream = null - - try { - captureStream = await navigator.mediaDevices.getDisplayMedia( - displayMediaOptions - ) - } catch (err) { - console.error('Error: ' + err) - } - document.getElementById('iframe_main').src = captureStream - } + self.initScreenShare() } if (res[1] == 'false') { document.getElementById('videoElement').style.width = '100%' - document.getElementById('iframe_main').src = null + document.getElementById('videoScreen').src = null } console.log(res[2]) if (res[2] != 'none') {