OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
42,364 Commits
217 Branches
561 Tags
467 MiB
Commit Graph

42364 Commits (ce3bc9dc07135aeba30e7426d358f096013b1c4b)

Author SHA1 Message Date
Richard van der Hoff 1de42f42e1 Merge pull request #66 from matrix-org/rav/factor_out_scrollpanel 
Factor out a separate 'ScrollPanel'
 2015-12-22 15:21:23 +00:00
Richard van der Hoff cdd539c3cd Factor out a separate 'ScrollPanel' 
Create an intelligent scrolling list, which doesn't care what it contains, to
try and clean up some of the logic in RoomView.
 2015-12-22 15:18:50 +00:00
Kegan Dougal a20cabb06f Merge branch 'develop' into kegan/tab-complete 2015-12-22 15:16:39 +00:00
Kegan Dougal e077517faf Ignore more keys when determining if the user is typing 
Specifically ignore CTRL, ALT, META, SHIFT, WINDOWS.
 2015-12-22 15:13:11 +00:00
David Baker 05d9e1261c Merge remote-tracking branch 'origin/develop' into notif_sync 2015-12-22 14:47:11 +00:00
Kegan Dougal e541ddb060 Auto-complete clicked suggestions 2015-12-22 11:14:36 +00:00
Richard van der Hoff cc90f4c0c6 Merge pull request #64 from matrix-org/rav/fix_date_separator 
Fix bug with date separator flashing up on scrollback
 2015-12-22 11:05:26 +00:00
Richard van der Hoff 360806a8f1 RoomView: add whitespace for disambiguation 2015-12-22 11:04:39 +00:00
Richard van der Hoff 6b07de05f3 Merge pull request #65 from matrix-org/rav/marker_at_top_of_search_results 
Add a 'top-of-search' marker
 2015-12-22 11:00:00 +00:00
Kegan Dougal 0dbb8d5294 Use MemberAvatar to generate image JSX. Split out entries from tab-complete logic 2015-12-22 10:00:30 +00:00
Matthew Hodgson ea2405ab3a escape double-slash commands 2015-12-22 00:57:57 +00:00
Matthew Hodgson 618978d955 add appropriate CSS for the TabCompleteBar 2015-12-22 00:47:04 +00:00
Kegan Dougal c8aaee46d7 Mark a TODO for timeout handling 2015-12-21 17:58:36 +00:00
Kegan Dougal ba63b5dfff Add image URLs to TabComplete.Entry objects 2015-12-21 17:28:04 +00:00
Kegan Dougal 4e79c3c4c8 Add allowLooping opt for tab completion. Make peeking work. 2015-12-21 17:16:49 +00:00
Kegan Dougal ab0a277d94 Rewrite tab-complete logic to allow peeking ahead 
This primarily means pre-calculating the list of things we'll be looping over
and then returning matches from this list. Make the regex match be more generic
rather than sorta-kinda-user-id-like-ish.
 2015-12-21 16:35:39 +00:00
Kegan Dougal 41d4c1d14e Add TabComplete.Entry so we can render images AND text(!) - Add peek() option, all broken. 2015-12-21 14:34:25 +00:00
Kegan Dougal 400b5196bb Add TabCompleteBar. Hook up display to whether we are currently tab completing. 2015-12-21 14:11:34 +00:00
Richard van der Hoff 7c285f9ad0 Add a 'No results' marker when there are no search results at all. 
Also reword the 'no more results' marker.
 2015-12-21 13:46:27 +00:00
Matthew Hodgson b9ba4475b8 Merge branch 'develop' into matthew/settings 2015-12-21 13:09:33 +00:00
David Baker 6ea3f21a8e Favicon badges 2015-12-21 12:55:13 +00:00
Richard van der Hoff 765e5bdeb1 Add a 'top-of-search' marker 
Ugly as hell, pending better suggestions.

This fixes https://github.com/vector-im/vector-web/issues/547
 2015-12-21 12:39:10 +00:00
Kegan Dougal 26dc3cc553 Push up instantiation of TabComplete to RoomView 
RoomView is the parent component which creates MessageComposer AND the status
bar. By making RoomView instantiate TabComplete we can scope instances
correctly rather than relying on singleton behaviour through dispatches. This
also makes communication between status bar and the MessageComposer infinitely
easier since they are now sharing the same TabComplete object.
 2015-12-21 10:59:10 +00:00
Richard van der Hoff afadb23f89 Fix bug with date separator flashing up on scrollback 
Refactor the event-tile generation loop to go forwards rather than backwards,
which makes it easier to figure out whether we are displaying a continuation of
the previous event, and whether we need a date separator.

Also only display the date separator at the top of the room if there's no more
scrollback to be shown.

This fixes vector-im/vector-web#431
 2015-12-21 10:49:00 +00:00
Kegan Dougal c6d02b2c26 Move tab-complete logic out from MessageComposer 
Moved to a `TabComplete` class. Make it more generic (list of strings rather
than RoomMembers) and sort the member list by last_active_ago. Everything still
seems to work.
 2015-12-21 10:38:37 +00:00
Richard van der Hoff ff6d9454fd Merge pull request #63 from matrix-org/rav/paginate_search 
Pagination for search results
 2015-12-21 09:16:42 +00:00
David Baker 5f6fe74ca8 Highlight status is now taken from the server's unread notif count 2015-12-18 17:51:17 +00:00
Kegsay e57d0601b6 Merge pull request #62 from matrix-org/kegan/archived-rooms 
Show archived rooms and implement forgetting
 2015-12-18 17:36:36 +00:00
Kegan Dougal d1baf5854c Only display the MessageComposer if you're joined and not viewing search results 2015-12-18 17:23:46 +00:00
Matthew Hodgson fa99c1fc59 make it clear result count is approx 2015-12-18 17:18:08 +00:00
Kegan Dougal f0ff62166b Remove bottommost prop - can't DND on the bottom list anymore 2015-12-18 17:13:26 +00:00
Kegan Dougal a2872deb53 Merge branch 'develop' into kegan/archived-rooms 2015-12-18 16:59:25 +00:00
Kegan Dougal 461e3f46dc Show an ErrorDialog when failing to forget a room 2015-12-18 16:56:37 +00:00
Richard van der Hoff 44c42394ae Fix scroll for search results 
Make sure that we save scroll position when searching, and use it to preserve
offset when backfilling.
 2015-12-18 16:42:46 +00:00
Matthew Hodgson 831aaec457 Merge pull request #57 from matrix-org/matthew/inbound-calls 
Position the inbound call box correctly
 2015-12-18 15:59:18 +00:00
Kegan Dougal c3bd81b83a Make rooms the user is banned in be treated as a joined room for position in room list 
This is so users can still find the room they've been expelled from, rather than
have it drop to the Historical section.
 2015-12-18 15:56:27 +00:00
Kegan Dougal 711fdd25af Improve perf of refreshing room list. Show spinner when loading left rooms. 
When the JS SDK encounters a new room it will emit a flurry of events for things
like state and room members. Refreshing the room list on each event is bad for
performance. This is okay initially because the room list is only shown after
the first sync, but when getting archived rooms it locks up for 15-30s as it
thrashes. Add a 1s cap to refreshRoomList() which means that it will refresh
*AT MOST* once every second. If it has been >1s since the last refresh it will
immediately refresh. If it has been <1s it will wait the difference.
 2015-12-18 15:13:59 +00:00
Matthew Hodgson 08ffadc2c4 unbreak 2015-12-18 14:04:39 +00:00
Kegan Dougal 22635f251d Call through to syncLeftRooms when the archived header is clicked 2015-12-18 11:55:43 +00:00
Richard van der Hoff ec32347f43 Request more search results when scroll hits top of window 2015-12-18 11:13:32 +00:00
Richard van der Hoff 3b87d45e32 Merge pull request #60 from matrix-org/rav/vector_search 
Refactor the search stuff in RoomView

* factor out the call to MatrixClient.search to a separate _getSearchBatch (so
  that we can reuse it for paginated results in a bit)
* Don't group cross-room searches by room - just display them in timeline
  order.
 2015-12-18 11:11:45 +00:00
Richard van der Hoff 4b271a332e Refactor the search stuff in RoomView 
* factor out the call to MatrixClient.search to a separate _getSearchBatch (so
  that we can reuse it for paginated results in a bit)
* Don't group cross-room searches by room - just display them in timeline
  order.
 2015-12-18 11:11:41 +00:00
Richard van der Hoff 9931ef1971 Merge pull request #61 from matrix-org/rav/fix_postinvite_dnd 
Initialise the messagepanel correctly after accepting an invite
 2015-12-18 10:32:24 +00:00
Richard van der Hoff d6c208a275 Reinstate the DnD event listener removals, with comments 2015-12-18 10:19:07 +00:00
Matthew Hodgson 4baf9d5589 Fix paths 2015-12-18 00:40:01 +00:00
Matthew Hodgson e2ae2dd199 merge stuff from vector 2015-12-18 00:37:56 +00:00
Matthew Hodgson 272d7362fb Merge branch 'develop' into matthew/settings 2015-12-18 00:14:36 +00:00
Matthew Hodgson 0f82b72e07 lost copyright 2015-12-18 00:13:57 +00:00
Matthew Hodgson f30b7eec2f Merge branch 'develop' into matthew/settings 2015-12-18 00:11:43 +00:00
Richard van der Hoff e0d05d4f4b Initialise the messagepanel correctly after accepting an invite 
This should fix vector-im/vector-web#538.

I'm sorry.
 2015-12-17 22:07:56 +00:00