diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-08-06 23:42:13 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-08-06 23:42:13 -0400 |
| commit | a9a2e03dc315b2e4ff86160e0663013060492016 (patch) | |
| tree | 412df8ec756342bda0389a0569d8aa07d5214a9a | |
| parent | 3427003fedae990c689841ac47f1d421a3f3d4ae (diff) | |
playlist stub
| -rw-r--r-- | public/js/lib/views/index.js | 1 | ||||
| -rw-r--r-- | public/js/lib/views/room/chat.js | 4 | ||||
| -rw-r--r-- | public/js/lib/views/room/room.js | 5 | ||||
| -rw-r--r-- | public/js/lib/views/room/settings.js | 3 | ||||
| -rw-r--r-- | views/pages/room.ejs | 9 |
5 files changed, 15 insertions, 7 deletions
diff --git a/public/js/lib/views/index.js b/public/js/lib/views/index.js index a333b45..c4c3021 100644 --- a/public/js/lib/views/index.js +++ b/public/js/lib/views/index.js @@ -23,7 +23,6 @@ var SiteRouter = Router.extend({ }, room: function(name){ - console.log("hi") room = app.view = new RoomView (name) }, diff --git a/public/js/lib/views/room/chat.js b/public/js/lib/views/room/chat.js index aadd9bc..27dc21d 100644 --- a/public/js/lib/views/room/chat.js +++ b/public/js/lib/views/room/chat.js @@ -15,6 +15,10 @@ var ChatView = View.extend({ this.messages = this.$messages.get(0) this.$msg.focus() $(window).focus(function(){ $msg.focus() }) + + socket.on("message", function(msg){ + base.chat.add(msg) + }) }, seen: {}, diff --git a/public/js/lib/views/room/room.js b/public/js/lib/views/room/room.js index 88f5b20..a98bd7a 100644 --- a/public/js/lib/views/room/room.js +++ b/public/js/lib/views/room/room.js @@ -22,11 +22,6 @@ var RoomView = View.extend({ base.userlist.update() base.settings.update(room.settings) }) - - app.socket.on("message", function(msg){ - base.chat.add(msg) - }) - } })
\ No newline at end of file diff --git a/public/js/lib/views/room/settings.js b/public/js/lib/views/room/settings.js index e192503..c6811d2 100644 --- a/public/js/lib/views/room/settings.js +++ b/public/js/lib/views/room/settings.js @@ -5,6 +5,7 @@ var SettingsView = View.extend({ events: { "click": "stopPropagation", "click .open": "open", + "click .close": "close", "blur [name=bg]": "updateBackground", "submit form": "save", }, @@ -26,7 +27,7 @@ var SettingsView = View.extend({ close: function(){ this.isOpen = false - this.$el.addClass("active") + this.$el.removeClass("active") $(document.body).off("click", this._close) }, diff --git a/views/pages/room.ejs b/views/pages/room.ejs index f3d5592..8849470 100644 --- a/views/pages/room.ejs +++ b/views/pages/room.ejs @@ -11,6 +11,15 @@ <div id="video"></div> +<div id="playlist"> + <form> + enter a url + <input type="text" name="url"> + </form> + <ul id="videos"> + </ul> +</div> + <% include ../partials/chat %> <% include ../partials/login %> <% include ../partials/settings %> |