summaryrefslogtreecommitdiff
path: root/public/js/lib
diff options
context:
space:
mode:
Diffstat (limited to 'public/js/lib')
-rw-r--r--public/js/lib/video.js102
-rw-r--r--public/js/lib/views/index.js13
-rw-r--r--public/js/lib/views/lobby/lobby.js (renamed from public/js/lib/views/lobby/index.js)12
-rw-r--r--public/js/lib/views/login.js6
-rw-r--r--public/js/lib/views/room/chat.js (renamed from public/js/lib/chat.js)30
-rw-r--r--public/js/lib/views/room/index.js10
-rw-r--r--public/js/lib/views/room/room.js29
-rw-r--r--public/js/lib/views/room/userlist.js29
-rw-r--r--public/js/lib/ws.js2
9 files changed, 155 insertions, 78 deletions
diff --git a/public/js/lib/video.js b/public/js/lib/video.js
index 2eb5c82..aa01d23 100644
--- a/public/js/lib/video.js
+++ b/public/js/lib/video.js
@@ -1,12 +1,16 @@
-var video = (function(){
- var video = {}
- var mx
-
- video.init = function(media){
- video.build()
- }
+var VideoView = View.extend({
+
+ events: {
+ },
+
+ initialize: function(media){
+ this.media = media
+ this.mx
+ this.build(media)
+ },
- video.build = function(media){
+ build: function(media){
+ var mxType
switch (media.type) {
case 'video':
mxType = MX.Video
@@ -21,71 +25,71 @@ var video = (function(){
if (app.muted) {
media.mute = true
}
- mx = new mxType({
+ this.mx = new mxType({
media: media,
backface: false,
})
- video.el.innerHTML = ""
- video.el.appendChild(mx.el)
+ this.el.innerHTML = ""
+ this.el.appendChild(this.mx.el)
- mx.load()
- }
+ this.mx.load()
+ },
- video.play = function(){
- mx.play()
- }
+ play: function(){
+ this.mx.play()
+ },
- video.pause = function(){
- mx.pause()
- }
+ pause: function(){
+ this.mx.pause()
+ },
- video.toggle = function(shouldPause){
+ toggle: function(shouldPause){
if (typeof shouldPause !== "boolean") {
- shouldPause = ! mx.paused
+ shouldPause = ! this.mx.paused
}
- shouldPause ? mx.pause() : mx.play()
+ shouldPause ? this.mx.pause() : this.mx.play()
return shouldPause
- }
+ },
- video.toggleMuted = function(shouldMute){
+ toggleMuted: function(shouldMute){
if (typeof shouldMute !== "boolean") {
- shouldMute = ! mx.muted
+ shouldMute = ! this.mx.muted
}
- shouldMute ? mx.mute() : mx.unmute()
+ shouldMute ? this.mx.mute() : this.mx.unmute()
return shouldMute
- }
+ },
- video.paused = function(){
- return mx.paused
- }
+ paused: function(){
+ return this.mx.paused
+ },
- video.muted = function(){
- return mx.muted
- }
+ muted: function(){
+ return this.mx.muted
+ },
- video.seek = function(n){
- mx.seek(n)
- }
+ seek: function(n){
+ this.mx.seek(n)
+ },
- video.setLoop = function(shouldLoop){
- mx.setLoop(shouldLoop)
- }
+ setLoop: function(shouldLoop){
+ this.mx.setLoop(shouldLoop)
+ },
- video.mute = function(muted){
+ mute: function(muted){
if (muted) {
- mx.mute()
+ this.mx.mute()
}
else {
- mx.unmute()
+ this.mx.unmute()
}
- }
+ },
- video.unmute = function(){
- mx.unmute()
- }
+ unmute: function(){
+ this.mx.unmute()
+ },
- video.setVolume = function(n){
- mx.setVolume(n)
+ setVolume: function(n){
+ this.mx.setVolume(n)
}
-})()
+})
diff --git a/public/js/lib/views/index.js b/public/js/lib/views/index.js
index d5ec35d..a333b45 100644
--- a/public/js/lib/views/index.js
+++ b/public/js/lib/views/index.js
@@ -1,9 +1,9 @@
+var lobby, room
+
var SiteRouter = Router.extend({
+
el: "body",
- events: {
- },
-
routes: {
"/": 'lobby',
"/v/:name": 'room',
@@ -11,7 +11,7 @@ var SiteRouter = Router.extend({
initialize: function(){
if (! user.username) {
- $("#login").show()
+ app.view = new LoginView()
}
else {
this.route()
@@ -19,11 +19,12 @@ var SiteRouter = Router.extend({
},
lobby: function(){
- this.view = new LobbyView ()
+ lobby = app.view = new LobbyView ()
},
room: function(name){
- this.view = new RoomView (name)
+ console.log("hi")
+ room = app.view = new RoomView (name)
},
}) \ No newline at end of file
diff --git a/public/js/lib/views/lobby/index.js b/public/js/lib/views/lobby/lobby.js
index 0306445..6821436 100644
--- a/public/js/lib/views/lobby/index.js
+++ b/public/js/lib/views/lobby/lobby.js
@@ -1,17 +1,23 @@
var LobbyView = View.extend({
+ el: "#lobby",
+
events: {
- "form submit": "join"
+ "submit form": "join"
},
initialize: function(){
this.$createRoom = this.$("#create-room")
},
- join: function(){
+ join: function(e){
+ console.log("hwat")
+ e && e.preventDefault()
var name = this.$createRoom.sanitizeName()
+ console.log("name")
+
if (! name) { return }
window.location.href = "/v/" + name
}
-}) \ No newline at end of file
+})
diff --git a/public/js/lib/views/login.js b/public/js/lib/views/login.js
index 325d22d..280f051 100644
--- a/public/js/lib/views/login.js
+++ b/public/js/lib/views/login.js
@@ -1,12 +1,16 @@
var LoginView = View.extend({
+
el: "#login",
events: {
- "form submit": "save",
+ "submit form": "save",
},
initialize: function(){
this.$el.show()
+ this.$username = this.$("#username")
+ this.$username.focus()
+ console.log(this.$username)
},
save: function(e){
diff --git a/public/js/lib/chat.js b/public/js/lib/views/room/chat.js
index 0968418..0932e47 100644
--- a/public/js/lib/chat.js
+++ b/public/js/lib/views/room/chat.js
@@ -1,36 +1,50 @@
var ChatView = View.extend({
- template: $("#collaborator-template").html(),
+ el: "#chat",
+
+ template: $("#message_template").html(),
events: {
"submit form": "send",
"scroll #messages": "scroll",
},
- initialize: function(){
- this.$msg = this.$("#message")
+ initialize: function(socket){
+ var $msg = this.$msg = this.$("#message")
this.$messages = this.$("#messages")
this.messages = this.$messages.get(0)
+ this.$msg.focus()
+ $(window).focus(function(){ $msg.focus() })
},
+ seen: {},
add: function(msg){
+ var key = msg.date + "_" + msg.nick
+ if (key in this.seen) return
+ this.seen[key] = true
+
var $el = $( this.template )
- $el.find(".nick").html(msg.nick)
- $el.find(".msg").html(msg.msg)
+ $el.find(".nick").html(sanitize(msg.nick))
+ $el.find(".msg").html(sanitizeHTML(msg.msg))
this.$messages.append($el)
if (! this.scrolled) {
this.scrollToBottom()
}
},
- send: function(){
+ send: function(e){
+ e && e.preventDefault()
var val = this.$msg.sanitize()
+ this.$msg.focus()
if (! val) return
+ this.$msg.val("")
var msg = {}
- msg.room = room.name()
+ msg.room = room.name
msg.msg = val
msg.nick = user.username
- // app.socket.send("message", msg)
+ msg.date = +new Date
+ this.add(msg)
+ app.socket.emit("message", msg)
},
empty: function(){
diff --git a/public/js/lib/views/room/index.js b/public/js/lib/views/room/index.js
deleted file mode 100644
index 58d7449..0000000
--- a/public/js/lib/views/room/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var RoomView = View.extend({
-
- events: {
- },
-
- initialize: function(name){
- app.socket = ws.connect(name)
- }
-
-}) \ No newline at end of file
diff --git a/public/js/lib/views/room/room.js b/public/js/lib/views/room/room.js
new file mode 100644
index 0000000..13f08ce
--- /dev/null
+++ b/public/js/lib/views/room/room.js
@@ -0,0 +1,29 @@
+var RoomView = View.extend({
+
+ events: {
+ },
+
+ initialize: function(name){
+
+ app.socket = ws.connect(name)
+
+ var base = this
+ this.name = name
+ this.chatView = new ChatView (socket)
+ this.userlist = new UserlistView (socket)
+
+ app.socket.emit("join", { nick: user.username })
+
+ app.socket.on("welcome", function(room){
+ room.messages.forEach(base.chat.add)
+ base.userlist.users = room.users
+ base.userlist.update()
+ })
+
+ app.socket.on("message", function(msg){
+ base.chat.add(msg)
+ })
+
+ }
+
+}) \ No newline at end of file
diff --git a/public/js/lib/views/room/userlist.js b/public/js/lib/views/room/userlist.js
new file mode 100644
index 0000000..600f647
--- /dev/null
+++ b/public/js/lib/views/room/userlist.js
@@ -0,0 +1,29 @@
+var UserlistView = View.extend({
+
+ el: "#userlist",
+
+ events: {
+ },
+
+ users: {},
+ initialize: function(socket){
+ var base = this
+ app.socket.on("joined", function(data){
+ base.users[data.nick] = true
+ base.update()
+ })
+ app.socket.on("parted", function(data){
+ delete base.users[data.nick]
+ base.update()
+ })
+ },
+
+ update: function(){
+ base.el.empty()
+ Object.keys(base.users).sort().forEach(function(nick){
+ var el = document.createElement("div")
+ base.el.appendChild(el)
+ })
+ },
+
+}) \ No newline at end of file
diff --git a/public/js/lib/ws.js b/public/js/lib/ws.js
index 3d62ef0..7d784ba 100644
--- a/public/js/lib/ws.js
+++ b/public/js/lib/ws.js
@@ -2,7 +2,7 @@ var ws = (function(){
var ws = {}
var socket, ready
ws.connect = function (room) {
- if (this.socket) return;
+ if (ws.socket) return;
var path = window.location.origin + '/' + room
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 07:10:16 +0000