summary refs log tree commit diff
path: root/webclient/rooms
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-15 17:42:02 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-15 17:42:11 +0100
commit5b817ecd44ac5672da2042bb72ba8cf6e8d911f1 (patch)
tree6b2891b92de5f94f0959907d03b44f0dd3eff7c1 /webclient/rooms
parentWhen new invites come down, update the My Rooms list. Added hacks to make the... (diff)
downloadsynapse-5b817ecd44ac5672da2042bb72ba8cf6e8d911f1.tar.xz
Added infinite scrolling. It's sliiiightly buggy in that it jumps down the list a bit, but it is overall working pretty well. Added ng-infinite-scroll-matrix.js and jquery-1.8.3 as deps.
Diffstat (limited to 'webclient/rooms')
-rw-r--r--webclient/rooms/rooms.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/rooms/rooms.html b/webclient/rooms/rooms.html
index 8edeb13ced..c3ee85f8a0 100644
--- a/webclient/rooms/rooms.html
+++ b/webclient/rooms/rooms.html
@@ -86,7 +86,7 @@
     </div>
     <div>
         <form>
-            <input size="40" ng-model="joinAlias.room_alias" ng-enter="joinAlias(joinAlias.room_alias)" placeholder="(e.g. #foo_channe:example.org)"/>
+            <input size="40" ng-model="joinAlias.room_alias" ng-enter="joinAlias(joinAlias.room_alias)" placeholder="(e.g. #foo_channel:example.org)"/>
             <button ng-disabled="!joinAlias.room_alias" ng-click="joinAlias(joinAlias.room_alias)">Join room</button>    
         </form>
     </div>