summaryrefslogtreecommitdiff
path: root/public/js/lib/views/room/room.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-08-09 18:12:46 -0400
committerJules Laplace <jules@okfoc.us>2015-08-09 18:12:46 -0400
commit92c289e25642b99c498412c49a37eff1c59b4ced (patch)
tree4755e69bab46e38feb8870f8d2695e074f3525b8 /public/js/lib/views/room/room.js
parentd51849ad72d841d60d5d9cd2793e78577fa85bd9 (diff)
thinkin about the video
Diffstat (limited to 'public/js/lib/views/room/room.js')
-rw-r--r--public/js/lib/views/room/room.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/public/js/lib/views/room/room.js b/public/js/lib/views/room/room.js
index a98bd7a..4231c2b 100644
--- a/public/js/lib/views/room/room.js
+++ b/public/js/lib/views/room/room.js
@@ -11,15 +11,15 @@ var RoomView = View.extend({
this.name = name
this.chat = new ChatView (app.socket)
this.userlist = new UserlistView (app.socket)
+ this.playlist = new PlaylistView (app.socket)
this.settings = new SettingsView (app.socket)
app.socket.emit("join", { nick: user.username })
app.socket.on("welcome", function(room){
console.log(room)
- base.chat.addMany( room.messages )
- base.userlist.users = room.users
- base.userlist.update()
+ base.chat.addMany(room.messages)
+ base.userlist.update(room.users)
base.settings.update(room.settings)
})
}