summary refs log tree commit diff
path: root/webclient/room/room.html
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-14 17:40:27 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-14 17:40:38 +0100
commit5de086b736218d43bd51c3b83ca26118806488a2 (patch)
tree0b4bcad068b903bb512feba3ca1214c2fd75d9ed /webclient/room/room.html
parentWe can now upload avatar image somewhere (diff)
downloadsynapse-5de086b736218d43bd51c3b83ca26118806488a2.tar.xz
More helpful display when the event stream fails, wiping it when the connection is regained.
Diffstat (limited to '')
-rw-r--r--webclient/room/room.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 0f86a158ec..3b9ba713de 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -86,7 +86,10 @@
                     <button ng-click="inviteUser(userIDToInvite)">Invite</button>
             </span>
             <button ng-click="leaveRoom()">Leave</button>
-            <button ng-click="loadMoreHistory()" ng-disabled="!state.can_paginate">MOAR HISTORY</button>
+            <button ng-click="loadMoreHistory()" ng-disabled="!state.can_paginate">Load more history</button>
+            <div ng-hide="!state.stream_failure">
+                {{ state.stream_failure.data.error || "Connection failure" }}
+            </div>
         </div>
     </div>