diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2014-08-22 01:33:34 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2014-08-22 01:33:34 +0100 |
| commit | fd47f55e943dc6950a1a84414e0ed8a08fbc504c (patch) | |
| tree | 59de3abb4ae971fbc56653bfdf3e66c09e26fcc5 /webclient/room | |
| parent | rename autoComplete directive as tabComplete to avoid confusion with the auto... (diff) | |
| download | synapse-fd47f55e943dc6950a1a84414e0ed8a08fbc504c.tar.xz | |
sacrifice a goat or two to make wordwrap actually work properly
Diffstat (limited to 'webclient/room')
| -rw-r--r-- | webclient/room/room.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 4a07dfdaaf..e7560a5dc4 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -29,7 +29,7 @@ <!-- FIXME: need to have better timestamp semantics than the (msg.content.hsob_ts || msg.ts) hack below --> <table id="messageTable" infinite-scroll="paginateMore()"> <tr ng-repeat="msg in events.rooms[room_id].messages" - ng-class="(events.rooms[room_id].messages[$index - 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item> + ng-class="(events.rooms[room_id].messages[$index + 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item> <td class="leftBlock"> <div class="sender" ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id">{{ members[msg.user_id].displayname || msg.user_id }}</div> <div class="timestamp">{{ (msg.content.hsob_ts || msg.ts) | date:'MMM d HH:mm:ss' }}</div> @@ -77,7 +77,7 @@ {{ state.user_id }} </td> <td width="*" style="min-width: 100px"> - <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-disabled="state.sending" ng-focus="true" auto-complete/> + <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-disabled="state.sending" ng-focus="true" autocomplete="off" tab-complete/> </td> <td width="150px"> <button ng-click="send()" ng-disabled="state.sending">Send</button> |