Commit Graph

12860 Commits

Author SHA1 Message Date
Michael Telatynski 0580d536ad Merge branch 'develop' into t3chguy/on_copy_tooltip 2017-09-10 18:54:52 +01:00
David Baker 7617788345 Merge pull request #1372 from matrix-org/dbkr/emoji_fast_path
Fast path for emojifying strings
2017-09-10 17:44:02 +01:00
David Baker 05a986334d Separate function to add code copy button
For neatness and also so it can show up separately in the profiler.
2017-09-10 15:58:17 +01:00
David Baker 876257f4e2 Consolidate the code copy button
Adding the code code button was done by manipulating the HTML of
the event body to add a span tag, then adding the onclick handler
after the thing was mounted. Apart from splitting the code between
two places, adding the span tag was, according to Chrome's
profiler, taking up quite a lot of CPU cycles (apparently as soon
as you set the innerHTML on a div). Instead, just build the whole
lot together after the component mounts.
2017-09-10 14:23:33 +01:00
David Baker ea5726aa4e Copyright 2017-09-08 23:14:06 +01:00
David Baker ec3ff529e7 Fast path for emojifying strings
Emojione's regex for detecting emoji is *enourmous* and we were
running it on every display name, room name, message etc every time
those components mounted. Add a much simpler regex to rule out the
majority of strings that contain no emoji and fast-path them.

Makes room switching about 10% faster (in my tests with all the
profiling turned on).
2017-09-08 23:05:27 +01:00
Michael Telatynski b10b0e573d i18n and change message depending on success of copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 11:29:55 +01:00
Michael Telatynski 269f1f33e3 show response on copy so you don't mash it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 11:27:25 +01:00
Robert Swain 53574541c3 AppTile: Add Jitsi electron screensharing support 2017-09-04 09:31:25 +02:00
Luke Barnard 0ded4acba0 Mark TODO for https://github.com/vector-im/riot-web/issues/4951 2017-08-31 17:52:53 +01:00
Luke Barnard d84190f58d Explain Flair debounce 2017-08-31 17:49:19 +01:00
Luke Barnard e89d52ccbf Do not get avatars when no groups were/could be retrieved 2017-08-31 16:46:39 +01:00
Luke Barnard 86e8a4c7e2 Make componentWillMount not async
This was left over from a previous refactor
2017-08-31 16:44:14 +01:00
David Baker 9efa604706 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-30 17:39:47 +01:00
David Baker cf747fcb57 Lint 2017-08-30 17:34:44 +01:00
Luke Barnard ebc1993530 Implement Flair
Add 14x14 group avatars next to sender profiles.
2017-08-30 11:10:49 +01:00
Richard Lewis 84481f1a1e Merge pull request #1350 from matrix-org/rxl881/scalarTokenFix
Make staging widgets work with live and vice versa.
2017-08-30 11:04:50 +01:00
Richard Lewis 2ff1888054 Make staging widgets work with live and vice versa. 2017-08-30 10:36:22 +01:00
Richard van der Hoff b9e047f0ff Avoid breaking /sync with uncaught exceptions
For reasons I don't fully understand, it appears that sometimes the
ReadReceiptMarker has no offsetParent. Rather than dying with an uncaught
exception when that happens (and taking out half of React as well as the /sync
handler), log a warning and suppress the animation.
2017-08-30 10:01:45 +01:00
David Baker 824b29dc1f PR feedback 2017-08-30 09:22:26 +01:00
David Baker d86fe0df6e Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-29 13:29:55 +01:00
Michael Telatynski 9658efd6d7 add comment and remove redundant logic 2017-08-28 01:04:18 +01:00
Michael Telatynski 21af3fe189 modularize and invert logic, so banned etc will count as left 2017-08-28 00:46:28 +01:00
Michael Telatynski 433cd505ee skip direct chats which either you or the target have left 2017-08-28 00:39:59 +01:00
Michael Telatynski b644751ca1 skip direct chats which you have left in memberinfo 2017-08-28 00:16:22 +01:00
Michael Telatynski edb449dfe5 we need to pass whether it is an invite RoomSubList explicitly (i18n) 2017-08-27 23:38:25 +01:00
Michael Telatynski cd1e58cb61 _tJsx returns a React Object, the sub fn must return a React Object
not a string
2017-08-26 08:18:55 +01:00
David Baker 299db845ff PR feedback 2017-08-25 12:10:13 +01:00
David Baker 5cfec247f0 Merge pull request #1331 from matrix-org/luke/fix-completion-click-to-insert
Fix click to insert completion
2017-08-24 14:56:15 +01:00
Michael Telatynski ec6867dc8b Fix React crying on machines without internet due to return undefined 2017-08-24 12:32:37 +01:00
David Baker c11432c3e3 Catch the promise rejection if scalar fails
Otherwise this is incredibly annoying when developing if you don't
have a scalar that will allow you to register (ie. if you're
testing against an HS on your dev box)
2017-08-23 19:35:33 +01:00
Luke Barnard 8ed5422a45 Fix click to insert completion
And remedy weird API in the process. Autocomplete now exposes `onSelectionChange` to indicate that the user has selected another completion, rather than returning the chosen completion via onUpArrow etc.

Fixes vector-im/riot-web#4835
2017-08-23 16:22:14 +01:00
Richard Lewis 502a0480a0 Merge pull request #1327 from matrix-org/matthew/multiple-widgets
Matthew/multiple widgets
2017-08-22 10:53:51 +01:00
David Baker e72bdffd62 Remove unused import 2017-08-22 10:22:51 +01:00
David Baker 5f816666e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-22 10:08:02 +01:00
Richard Lewis a69cc9169f lint fix. 2017-08-22 10:04:57 +01:00
David Baker ac64e9b705 Lint 2017-08-21 19:34:07 +01:00
David Baker b898d15580 Specify default number of members to load 2017-08-21 19:30:28 +01:00
David Baker e77ea352e4 Support full group membership cycle
Apart from knocking, ie. Invite / accept / reject / leave
2017-08-21 19:18:32 +01:00
David Baker a0fe3d1cb0 Merge pull request #1326 from matrix-org/rav/userpicker_proptypes
Fix proptypes on UserPickerDialog
2017-08-21 16:43:15 +01:00
Richard van der Hoff 764d5891ad Fix proptypes on UserPickerDialog
... so that it doesn't log an error
2017-08-21 16:30:49 +01:00
Richard Lewis b7569a9831 Revert auxPanel changes (this should already have been fixed in a separate PR). 2017-08-21 15:29:11 +01:00
Robert Swain 385205471b AppsDrawer: Remove unnecessary bind 2017-08-21 15:34:13 +02:00
Richard Lewis c0f0425907 Merge pull request #1322 from matrix-org/rxl881/styling
Position add app widget link
2017-08-21 14:03:27 +01:00
Richard Lewis 6c8391e3ea Remove beta tag. 2017-08-21 11:39:06 +01:00
Richard Lewis e93a1fac3d Position add app widget link 2017-08-21 11:29:42 +01:00
Robert Swain 2eac869e27 Merge branch 'develop' into rob/apps-not-e2ee 2017-08-21 10:30:38 +02:00
Robert Swain 70824960ee AppPermission: Make strings translatable 2017-08-21 10:23:55 +02:00
Matthew Hodgson d7f5295949 untested WIP for supporting multiple widgets properly 2017-08-18 18:40:00 +01:00
Richard Lewis 1862057695 Only render appTile body (including warnings) if drawer shown. 2017-08-18 18:33:56 +01:00