From cb49b15eabec30c657f2f326b7458e4754366982 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Fri, 31 Jul 2015 11:49:59 +0100 Subject: [PATCH] Simplify --- lib/react/user.jsx | 1 - public/js/app.js | 32 +++++++++++--------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/lib/react/user.jsx b/lib/react/user.jsx index c9e4330..affcc9b 100644 --- a/lib/react/user.jsx +++ b/lib/react/user.jsx @@ -58,7 +58,6 @@ var UserMenu = React.createClass({ }); }); }, - updateUsers: , render: function () { var users = this.props.users.map(function (user) { return ( diff --git a/public/js/app.js b/public/js/app.js index e40436a..27258eb 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -759,19 +759,6 @@ var MessageBar = React.createClass({displayName: "MessageBar", "use strict"; -var UserCounter = React.createClass({displayName: "UserCounter", - render: function () { - return ( - React.createElement("li", null, - React.createElement("a", {href: "#"}, - React.createElement("i", {className: "fa fa-users fa-fw"}), " Online", - React.createElement("span", {className: "badge add-left"}, " ", this.props.count, " ") - ) - ) - ); - } -}); - var UserLogin = React.createClass({displayName: "UserLogin", authorizeId: function (id) { id = parseInt(id, 10); @@ -819,17 +806,15 @@ var UserLogin = React.createClass({displayName: "UserLogin", var UserMenu = React.createClass({displayName: "UserMenu", getDefaultProps: function () { return { - count: 0, users: [] }; }, componentDidMount: function () { - socket.on('users:update', this.updateUsers); - }, - updateUsers: function (data) { - this.setProps({ - count: data.count, - users: data.users + var self = this; + socket.on('users:update', function (data) { + self.setProps({ + users: data.users + }); }); }, render: function () { @@ -840,7 +825,12 @@ var UserMenu = React.createClass({displayName: "UserMenu", }); return ( React.createElement("ul", {className: "nav", id: "side-menu"}, - React.createElement(UserCounter, React.__spread({}, this.props)), + React.createElement("li", null, + React.createElement("a", {href: "#"}, + React.createElement("i", {className: "fa fa-users fa-fw"}), " Online", + React.createElement("span", {className: "badge add-left"}, " ", this.props.users.length, " ") + ) + ), users, React.createElement("li", null, React.createElement("br", null), React.createElement(UserLogin, null), React.createElement("br", null)) )