From ceb243fbb289fd9faec7854beef643d83e99b105 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 9 Jul 2015 16:04:13 -0700
Subject: The options to change member roles are now links so that they have
 the 'click' mouse hand when hovered over

---
 web/react/components/member_list_team.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index 3613d97d8..cfb473e5e 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -92,10 +92,10 @@ var MemberListTeamItem = React.createClass({
                         <span className="caret"></span>
                     </a>
                     <ul className="dropdown-menu member-menu" role="menu" aria-labelledby="channel_header_dropdown">
-                        { showMakeAdmin ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeAdmin}>Make Admin</a></li> : "" }
-                        { showMakeMember ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeMember}>Make Member</a></li> : "" }
-                        { showMakeActive ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeActive}>Make Active</a></li> : "" }
-                        { showMakeNotActive ? <li role="presentation"><a role="menuitem" onClick={this.handleMakeNotActive}>Make Inactive</a></li> : "" }
+                        { showMakeAdmin ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeAdmin}>Make Admin</a></li> : "" }
+                        { showMakeMember ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeMember}>Make Member</a></li> : "" }
+                        { showMakeActive ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeActive}>Make Active</a></li> : "" }
+                        { showMakeNotActive ? <li role="presentation"><a role="menuitem" href="#" onClick={this.handleMakeNotActive}>Make Inactive</a></li> : "" }
                     </ul>
                 </div>
                 { server_error }
-- 
cgit v1.2.3-1-g7c22


From 95a1540dffe1c279b109e73b47f016e6b8d4a663 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 9 Jul 2015 16:25:57 -0700
Subject: Leave result of _getMoreChannels unitialized if it does not yet exist
 in browser storage to know when list of more channels is loading vs when its
 empty

---
 web/react/components/more_channels.jsx | 5 +++++
 web/react/stores/channel_store.jsx     | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index 1af259853..f7a88e595 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -66,6 +66,11 @@ module.exports = React.createClass({
         if (this.state.channels != null)
             moreChannels = this.state.channels;
 
+        console.log("Check: " + moreChannels)
+
+        if (moreChannels)
+            console.log("Length: " + moreChannels.length)
+
         return (
             <div className="modal fade" id="more_channels" ref="modal" tabIndex="-1" role="dialog" aria-hidden="true">
                 <div className="modal-dialog">
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index 340ce9922..f6b8fecd4 100644
--- a/web/react/stores/channel_store.jsx
+++ b/web/react/stores/channel_store.jsx
@@ -209,10 +209,6 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
     catch (err) {
 	}
 
-	if (channels == null) {
-		channels = [];
-	}
-
     return channels;
   },
   _storeExtraInfos: function(extraInfos) {
-- 
cgit v1.2.3-1-g7c22


From 212a0da5f47a6f85eb0556258ead5f07fe9497c2 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 9 Jul 2015 16:26:53 -0700
Subject: Removed extraneous console.log functions

---
 web/react/components/more_channels.jsx | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'web')

diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index f7a88e595..1af259853 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -66,11 +66,6 @@ module.exports = React.createClass({
         if (this.state.channels != null)
             moreChannels = this.state.channels;
 
-        console.log("Check: " + moreChannels)
-
-        if (moreChannels)
-            console.log("Length: " + moreChannels.length)
-
         return (
             <div className="modal fade" id="more_channels" ref="modal" tabIndex="-1" role="dialog" aria-hidden="true">
                 <div className="modal-dialog">
-- 
cgit v1.2.3-1-g7c22


From 2a1cdc68c8639ae21b00f29fa372359489cfedcc Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 10 Jul 2015 11:48:52 -0700
Subject: Better logic for checking if channel has loaded

---
 web/react/components/more_channels.jsx | 2 +-
 web/react/stores/channel_store.jsx     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index 1af259853..c3ddc76f3 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -79,7 +79,7 @@ module.exports = React.createClass({
                             <button data-toggle="modal" data-target="#new_channel" data-channeltype={this.state.channel_type} type="button" className="btn btn-primary channel-create-btn" onClick={this.handleNewChannel}>Create New Channel</button>
                         </div>
                         <div className="modal-body">
-                            {moreChannels ?
+                            {!moreChannels.loading ?
                                 (moreChannels.length ?
                                     <table className="more-channel-table table">
                                         <tbody>
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index f6b8fecd4..4429a5312 100644
--- a/web/react/stores/channel_store.jsx
+++ b/web/react/stores/channel_store.jsx
@@ -202,13 +202,18 @@ var ChannelStore = assign({}, EventEmitter.prototype, {
     BrowserStore.setItem("more_channels", JSON.stringify(channels));
   },
   _getMoreChannels: function() {
-    var channels;
+    var channels = null;
     try {
         channels = JSON.parse(BrowserStore.getItem("more_channels"));
     }
     catch (err) {
 	}
 
+    if (channels == null) {
+        channels = {};
+        channels.loading = true;
+    }
+
     return channels;
   },
   _storeExtraInfos: function(extraInfos) {
-- 
cgit v1.2.3-1-g7c22


From 6f043c5b740c9bbc6e17b4ef79da1ed29fb96668 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 10 Jul 2015 11:54:36 -0700
Subject: Final change to code affected by change to loading more channels
 logic

---
 web/react/utils/async_client.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index a2a6f8db7..6db2db2b1 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -104,7 +104,7 @@ module.exports.updateLastViewedAt = function() {
 module.exports.getMoreChannels = function(force) {
     if (isCallInProgress("getMoreChannels")) return;
 
-    if (!ChannelStore.getMoreAll() || force) {
+    if (ChannelStore.getMoreAll().loading || force) {
 
         callTracker["getMoreChannels"] = utils.getTimestamp();
         client.getMoreChannels(
-- 
cgit v1.2.3-1-g7c22