Skip to content

Commit

Permalink
added mute and stop buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
charleenfei committed Jan 17, 2017
1 parent 311ef67 commit e42a285
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 139 deletions.
71 changes: 37 additions & 34 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 5 additions & 11 deletions client/vue-components/main_content.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,11 @@
<div class="content">

<div class="content-left">
<<<<<<< 7f4091f7ead5a0f6a8eae4081c24c33260468ed8
<videocomponent id="video" :wsrtc="wsRTC" :uri="URI"></videocomponent>

<div class="doc-info" v-if="count > 0">
<div>{{ count }} words</div>
<div>{{ time }} read</div>
</div>
=======
<VideoComponent id="video" :wsRTC="wsRTC"></VideoComponent>
>>>>>>> rebase
</div>

<div class="content-right">
Expand All @@ -37,26 +32,24 @@
import Chance from 'chance'
export default {
created() {
let chance = new Chance()
let c = this.$route.params.channel
this.URI = c !== undefined && /^\w{5}$/.test(c) ? c : chance.word({length: 5})
//create RTC websocket
<<<<<<< 7f4091f7ead5a0f6a8eae4081c24c33260468ed8
this.wsRTC = new WebSocket(`wss:https://${window.location.host}/ws/${this.URI}rtc`);
=======
this.wsRTC = new WebSocket(`wss:https://${window.location.host}/ws/${URI}rtc`)
>>>>>>> rebase
// update URL display. I still think we can do this with router somehow :S
window.history.pushState(window.location.origin, '/', this.URI);
},
mounted() {
sharedb.types.register(richText.type)
let socket = new WebSocket(`ws:https://${window.location.hostname}:3000/${this.URI}`)
const connection = new sharedb.Connection(socket)
console.log(socket, this.wsRTC)
//console.log(socket, this.wsRTC)
// For testing reconnection
window.disconnect = function() {
connection.close();
Expand All @@ -78,6 +71,7 @@
})
docSubscribe(this.quill, doc)
},
data() {
return {
ws: null,
Expand Down
Loading

0 comments on commit e42a285

Please sign in to comment.