From d5b14ccb39b80ad7a68522537346e57dee777360 Mon Sep 17 00:00:00 2001 From: Richard Alam <ritzalam@gmail.com> Date: Sun, 28 Oct 2012 15:56:03 +0000 Subject: [PATCH] - cleanup --- labs/html5-embed/public/index.html | 2 +- labs/html5-embed/public/js/views/users/users.js | 17 ++--------------- .../public/templates/users/user.html | 2 +- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/labs/html5-embed/public/index.html b/labs/html5-embed/public/index.html index c757cf5148..8b244bcc53 100755 --- a/labs/html5-embed/public/index.html +++ b/labs/html5-embed/public/index.html @@ -49,7 +49,7 @@ <button type="button" onclick="sendPublicChat()">Send Public Chat</button> <button type="button" onclick="sendPrivateChat()">Send Private Chat</button> </div> - <div id="layout" class="users-enabled"> + <div id="layout"> <div id="content" style="display: block"> <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%" id="BigBlueButton" name="BigBlueButton" align="middle"> <param name="movie" value="http://192.168.0.249/client/BigBlueButton.swf?v=VERSION" /> diff --git a/labs/html5-embed/public/js/views/users/users.js b/labs/html5-embed/public/js/views/users/users.js index 0414ddd911..3d61d1216e 100755 --- a/labs/html5-embed/public/js/views/users/users.js +++ b/labs/html5-embed/public/js/views/users/users.js @@ -10,8 +10,7 @@ define([ var UsersView = Backbone.View.extend({ el: 'ul', - initialize: function(){ - // UserCollection.on('add', this.addUser, this); + initialize: function(){ var self = this; UserCollection.bind("reset", this.render, this); UserCollection.bind("add", function (user) { @@ -19,27 +18,15 @@ define([ }); }, render: function(){ - console.log("*** Rendering Users View [" + UserCollection.length + "]"); $(this.el).empty(); _.each(UserCollection.models, function (user) { $(this.el).append(new UserView({model:user}).render().el); }, this); return this; - }, - addUser: function(user) { - var compiledTemplate = _.template( usersTemplate); -// this.$el.html( compiledTemplate ); - console.log("Adding user [" + user.get("username") + "]"); - var view = new UserView({model: user}); - - this.$el.append(view.render().el); - console.log("Rendering [" + this.$el.html() + "]"); - } + } }); var usersView = new UsersView(); - UserCollection.on("add", usersView.render); - return usersView; }); diff --git a/labs/html5-embed/public/templates/users/user.html b/labs/html5-embed/public/templates/users/user.html index e88dee095a..a32d0caa51 100755 --- a/labs/html5-embed/public/templates/users/user.html +++ b/labs/html5-embed/public/templates/users/user.html @@ -1 +1 @@ -<%= userid %> - <%= username %> +<%= username %> -- GitLab