J. Ryan Stinnett
18d444d2e7
Remove reacted with text when shortcode missing
...
If we don't have the shortcode for some emoji, don't show any "reacted with X"
text in the reaction tooltip.
Fixes https://github.com/vector-im/riot-web/issues/9786
2019-05-21 15:08:11 +01:00
Bruno Windels
2d4d608ed6
Merge pull request #2997 from matrix-org/bwindels/pill-avatars
...
Message editing: render avatars for pills in the editor
2019-05-21 12:11:06 +00:00
Bruno Windels
e48e72c162
pr feedback
2019-05-21 13:50:27 +02:00
Bruno Windels
fb03b5b168
fix lint
2019-05-21 13:49:43 +02:00
Matthew Hodgson
30a485bddd
Merge pull request #2995 from matrix-org/matthew/twemoji
...
Replace emojione with twemoji + emojibase
2019-05-21 11:32:53 +01:00
Bruno Windels
a75c948e2e
don't cache DRP
2019-05-21 12:24:12 +02:00
Bruno Windels
7c03d71607
give continued events a little bit of top padding
...
this way, the background isn't clipped at the top
2019-05-21 12:20:58 +02:00
Bruno Windels
5d184b3f77
reuse mx_Pill styles for editor pills to avoid style duplication
...
the avatar style code is still different though,
as it's implemented differently
This also prevents updating the css variables when not needed,
which caused the avatar to flicker when updating the editor.
2019-05-21 12:19:35 +02:00
Bruno Windels
b00a38a1e5
apply mx_EventTile_content to editor, so it gets the same right margin
...
this way we don't have to include it in the magic number
2019-05-21 12:18:20 +02:00
Travis Ralston
bf2a47b4d5
Merge pull request #3000 from matrix-org/t3chguy/hide_file_panel_typing_notifs
...
Hide WhoIsTyping component if the MessagePanel is shaped e.g file grid
2019-05-20 15:37:56 -06:00
Travis Ralston
7979934b6d
Merge pull request #2999 from matrix-org/t3chguy/copied_tooltip
...
Close copy tooltip in edge cases correctly
2019-05-20 15:36:12 -06:00
Michael Telatynski
868c99d140
Hide WhoIsTyping component if the MessagePanel is shaped e.g file grid
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-20 21:53:15 +01:00
Michael Telatynski
e2476acd0a
Close copy tooltip in edge cases correctly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-20 21:44:05 +01:00
Matthew Hodgson
d3f06763b3
Merge branch 'develop' into matthew/twemoji
2019-05-20 16:38:44 +01:00
J. Ryan Stinnett
db73e641ea
Merge pull request #2998 from matrix-org/jryans/clamp-reaction-senders
...
Limit reaction sender tooltip to 6 people
2019-05-20 16:33:26 +01:00
J. Ryan Stinnett
1bc9badeac
Limit reaction sender tooltip to 6 people
...
This limits the number of senders shown in the reaction sender tooltip shown
when hovering a reaction to 6 people followed by "and N others" for the rest.
Fixes https://github.com/vector-im/riot-web/issues/9722
2019-05-20 16:02:10 +01:00
J. Ryan Stinnett
0e5f0f24cc
Extract MELS-style comma separated list to shared utility
...
This allows other UI components to use the same formatting for a long list.
2019-05-20 15:21:18 +01:00
Bruno Windels
2bacabc002
apply 34px margin the mx_EventTile_content also has
...
so width of editor stay the same as content
(unrelated to pills, really)
2019-05-20 16:01:31 +02:00
Bruno Windels
5d80c3a2a4
fallback to avatar bg color
2019-05-20 15:39:06 +02:00
Bruno Windels
01ef1dd20e
style room pills correctly
2019-05-20 15:38:59 +02:00
Bruno Windels
df4f380082
find room by alias in room pill
2019-05-20 15:34:15 +02:00
Bruno Windels
0e98b124ac
undo thinko of passing current room as pill room
2019-05-20 15:33:54 +02:00
Bruno Windels
230e53fe2f
move most of room avatar handling to Avatar, to reuse in editor pills
2019-05-20 15:33:26 +02:00
Bruno Windels
5edfd01cb2
remove unused _getInitialLetter
2019-05-20 14:49:59 +02:00
Bruno Windels
c1b2f3dce1
make user pill avatars work in editor
2019-05-20 14:21:25 +02:00
Bruno Windels
e58d844e5b
move getInitialLetter to Avatar so we can reuse it for editor pills
2019-05-20 14:20:36 +02:00
Matthew Hodgson
e764ba4890
remove accidental whitespace
2019-05-20 10:10:30 +01:00
Matthew Hodgson
7b2602f1c7
apply monospace to pre
2019-05-20 10:09:19 +01:00
Matthew Hodgson
e3d3b155d6
remove errant debug
2019-05-20 10:08:34 +01:00
Bruno Windels
1368a5eb80
Merge pull request #2996 from matrix-org/bwindels/composerdesign
...
Message editing: apply design
2019-05-20 08:42:41 +00:00
Bruno Windels
a47e722fa1
same height as normal pill
2019-05-20 10:28:26 +02:00
Bruno Windels
3b598a1782
set pill avatar through css variables to set on psuedo-element
...
this way it won't interfere with editor selection/caret
2019-05-20 10:28:26 +02:00
Bruno Windels
710338c01f
pass member and room to editor pills to get avatar url
2019-05-20 10:28:26 +02:00
Bruno Windels
0c0052d06e
re-apply formatting when editor is closed
2019-05-20 10:19:29 +02:00
Matthew Hodgson
b0ec594c5a
comment on the futility of stripped-emoji.json
2019-05-19 21:19:20 +01:00
Matthew Hodgson
81338306b0
fix lint
2019-05-19 21:00:14 +01:00
Matthew Hodgson
64e2de5b47
make autocomplete work again
2019-05-19 20:56:07 +01:00
Matthew Hodgson
dbc6815abf
make EmojiProvider and stripped-emoji.json work
2019-05-19 20:48:18 +01:00
Matthew Hodgson
497be91c4d
combine regexps correctly
2019-05-19 17:53:36 +01:00
Matthew Hodgson
e48cc44cba
apply monospace font correctly
2019-05-19 17:41:18 +01:00
Matthew Hodgson
069a5a9546
remove obsolete emojione css
2019-05-19 17:11:41 +01:00
Matthew Hodgson
9f70bf3aec
fix bigemoji
2019-05-19 17:06:21 +01:00
Matthew Hodgson
24b03374ac
moar lineheight needed for big twemoji
2019-05-19 16:48:29 +01:00
Matthew Hodgson
54cea146e8
fix ugly formatting
2019-05-19 16:48:15 +01:00
Matthew Hodgson
c63419f8a2
typos
2019-05-19 16:31:25 +01:00
Matthew Hodgson
a8297a7698
fix build
2019-05-19 16:11:12 +01:00
Matthew Hodgson
dc72641264
replace emojione with twemoji. completely untested & debugged & unoptimised
2019-05-19 15:23:43 +01:00
J. Ryan Stinnett
3a87f53a3c
Merge pull request #2993 from matrix-org/jryans/devtools-event-source-in-timeline
...
Add debug feature to show hidden events in timeline
2019-05-18 19:37:58 +01:00
J. Ryan Stinnett
5144907983
Fix indent
2019-05-17 17:44:11 +01:00
J. Ryan Stinnett
45cdf880b1
Change setting style
2019-05-17 17:43:08 +01:00
