Merge branch 'master' into some-view-changes

# Conflicts:
#	src/App.vue
#	src/lib/VueJanus.vue
master
Mustafa Yontar 5 years ago
commit 47de21f73a
  1. 14
      src/lib/VueJanus.vue

@ -180,7 +180,8 @@
deviceSelectDialog: false,
noVid: false,
shareScreenId: null,
remoteStreams: []
remoteStreams: [],
screenShareStarted: false
}
},
name: "VueJanus",
@ -252,7 +253,18 @@
onlocalstream: this.onlocalstreamScreen
}
)
this.screenShareStarted=true;
},
screenShareStop(){
var srcObject=this.$refs.ownstreamscreen.srcObject;
for (const track of srcObject.getTracks()) {
track.stop();
}
var unpublish = { request: 'unpublish' };
this.janusScreenShareHandle.send({ message: unpublish });
this.janusScreenShareHandle.detach();
this.screenShareStarted=false;
},
screenShare () {
if(!this.$janus.isExtensionEnabled()) {