move refreshUsers into UsersStore

mythz · mythz · commit 9940d93eb556 · 2014-12-06T19:32:41.000-05:00
diff --git a/src/ChatReact/ChatReact/Web.config b/src/ChatReact/ChatReact/Web.config
@@ -14,6 +14,7 @@
 
   <appSettings>
     <add key="background" value="/img/bg.jpg" />
+    <add key="DebugMode" value="True" />
     <add key="LimitRemoteControlToAuthenticatedUsers" value="False" />
 
     <!-- Uncomment to use fan-out Redis Server Events -->
diff --git a/src/ChatReact/ChatReact/default.cshtml b/src/ChatReact/ChatReact/default.cshtml
@@ -32,16 +32,17 @@
     <script type="text/javascript">
         var AppData = {
             channel: "@channel",
-            isAuthenticated: @IsAuthenticated.ToString().ToLower()
+            isAuthenticated: @IsAuthenticated.ToString().ToLower(),
+            channelSubscribersUrl: "/event-subscribers?channel=@channel"
         };
     </script>
 </head>
-    <body>
+    <body> 
         
         <div id="app"></div>
 
         <!-- build:js js/app.jsx.js -->
-        <script type="text/jsx" src="js/components/Actions.js"></script>
+        <script type="text/javascript" src="js/components/Actions.js"></script>
         <script type="text/jsx" src="js/components/User.jsx"></script>
         <script type="text/jsx" src="js/components/Header.jsx"></script>
         <script type="text/jsx" src="js/components/Sidebar.jsx"></script>
diff --git a/src/ChatReact/ChatReact/js/components/Actions.js b/src/ChatReact/ChatReact/js/components/Actions.js
@@ -3,7 +3,7 @@ var Actions = Reflux.createActions([
 	"addMessages",
 	"removeAllMessages",
 	"recordMessage",
-    "setUsers",
+    "refreshUsers",
 	"showError",
     "logError",
     "announce",
@@ -50,9 +50,16 @@ var UsersStore = Reflux.createStore({
 		this.listenToMany(Actions);
 		this.users = [];
 	},
-	setUsers: function (users) {
-		this.users = users;
-		this.trigger(this.users);
+	refreshUsers: function () {
+	    var $this = this;
+	    $.getJSON(AppData.channelSubscribersUrl, function (users) {
+	        var usersMap = {};
+	        $.map(users, function (user) {
+	            usersMap[user.userId] = user;
+	        });
+	        $this.users = $.map(usersMap, function (user) { return user; });
+	        $this.trigger($this.users);
+	    });
 	}
 });
 
diff --git a/src/ChatReact/ChatReact/js/components/ChatApp.jsx b/src/ChatReact/ChatReact/js/components/ChatApp.jsx
@@ -47,13 +47,13 @@ var ChatApp = React.createClass({
                         Actions.addMessages(r.results);
                     });
 
-                    $this.refreshUsers();
+                    Actions.refreshUsers();
                 },
                 onReconnect: function () {
                     console.log("onReconnect", { newEventSource: this, errorArgs: arguments });
                 },
-                onJoin: this.refreshUsers,
-                onLeave: this.refreshUsers,
+                onJoin: Actions.refreshUsers,
+                onLeave: Actions.refreshUsers,
                 chat: function (m, e) {
                     Actions.addMessages([m]);
                 }
@@ -66,17 +66,6 @@ var ChatApp = React.createClass({
             }
         });
     },
-    refreshUsers: function() {
-        $.getJSON("/event-subscribers?channel=" + this.props.channel, function (users) {
-            usersMap = {};
-            $.map(users, function (user) { 
-                usersMap[user.userId] = user; 
-            });
-            Actions.setUsers($.map(usersMap, function(user) { 
-                return user; 
-            }));
-        });
-    },
     onMessagesUpdate: function(messages) {
         var $this = this;
         this.setState({ messages: messages }, function(){
