Travis Ralston
a73436e1a1
Don't use oobData if there is none
...
Fixes the "buttons don't work" problem on https://github.com/vector-im/riot-web/issues/10114
2019-06-25 20:31:20 -06:00
Travis Ralston
9771ce1e04
Merge pull request #3136 from matrix-org/t3chguy/room_directory_autojoin
...
When joining from room directory, use auto_join
2019-06-25 12:28:41 -06:00
J. Ryan Stinnett
c9dc4cbea3
Merge pull request #3137 from matrix-org/jryans/tooltip-interaction
...
Improve API and interactivity of new tooltip
2019-06-25 12:26:25 +01:00
J. Ryan Stinnett
67130cb45f
Condense isInRect
2019-06-25 11:57:55 +01:00
Michael Telatynski
7391796eab
Only autojoin using the search box enter/join btn
2019-06-25 10:18:47 +01:00
Bruno Windels
a9b5d2095c
Merge pull request #3132 from matrix-org/bwindels/edit-full-feature-flag
...
feature flag for displaying edits as well
2019-06-24 21:00:58 +00:00
J. Ryan Stinnett
72bfc3b5ea
Improve API and interactivity of new tooltip
...
This reworks the API the `InteractiveTooltip` component so that it's more
natural to use just like other React components. You can now supply the target
component as a child and the tooltip content as a prop.
In addition, this tweaks the interactivity to keep the tooltip on screen until
you move the mouse away from the tooltip and its target.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-24 17:32:36 +01:00
Bruno Windels
57dce73cee
adjust comment
2019-06-24 16:53:42 +02:00
Bruno Windels
8394e162ad
cache setting where it's easy
2019-06-24 16:53:31 +02:00
J. Ryan Stinnett
f366f7d2b3
Merge pull request #3131 from matrix-org/jryans/interactive-tooltip
...
Add interactive tooltip style
2019-06-24 15:42:02 +01:00
J. Ryan Stinnett
fff67e27af
Merge pull request #3129 from matrix-org/jryans/context-menu-slim
...
Remove redundant extra chevrons from ContextualMenu
2019-06-24 10:53:07 +01:00
Michael Telatynski
9e7a70b9d5
When joining from room directory, use auto_join
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-23 22:39:04 +01:00
Bruno Windels
5fa3f70fb4
feature flag for displaying edits as well
2019-06-21 18:32:15 +02:00
Bruno Windels
1c7af38d83
Merge pull request #3126 from matrix-org/bwindels/caret-refactoring
...
Editor caret improvements
2019-06-21 15:02:41 +00:00
Bruno Windels
c443dd7a32
clarify why use a BOM marker for the caret nodes
2019-06-21 16:37:29 +02:00
J. Ryan Stinnett
80d73d8430
Add optional rounded chevron for tooltip
...
We'd like to have a rounded point on the chevron for an extra level of polish.
This implements that look for browsers that support `clip-path`.
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:10:17 +01:00
J. Ryan Stinnett
3bd247ebaa
Tweak interactive tooltip to match design
...
This tweaks the tooltip to match the color, spacing, etc. seen in the designs.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:10:08 +01:00
J. Ryan Stinnett
32bf4588dd
Center tooltip along top or bottom of target
...
This adjusts the positioning to work more the way we want:
* Tooltip is position on the top or bottom edge of the target depending on where
space is available
* Tooltip and chevron are centered
In addition, more bits borrowed from `ContextualMenu` are not needed, so they
have been removed for simplicity.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
J. Ryan Stinnett
6dcdad028e
Clone ContextualMenu to InteractiveTooltip
...
As part of reactions and editing work, we're adding a new style of tooltip that
allows interacting with the content of the tooltip. `ContextualMenu` is closest
out of the things we have today, but it doesn't position in quite the way we
want and it's already quite complex.
To get started, let's first clone that to a new `InteractiveTooltip`.
Part of https://github.com/vector-im/riot-web/issues/9753
Part of https://github.com/vector-im/riot-web/issues/9716
2019-06-21 15:04:19 +01:00
Bruno Windels
50315557ba
Merge pull request #3130 from matrix-org/bwindels/disable-left-right-autocomplete
...
Disable left/right arrow navigating completions for now
2019-06-21 12:32:11 +00:00
Bruno Windels
cf0799289d
Disable left/right arrow navigating completions for now
...
as the autocomplete is now very eager to appear, this breaks
caret navigation when typing e.g. anything with a colon.
Ideally, we should make the AC less eager to appear,
but this is a quick fix for now.
2019-06-21 13:48:52 +02:00
Bruno Windels
701e18d588
Merge pull request #3128 from matrix-org/bwindels/edit-nested-lists
...
Fix: take list nesting into account for indenting
2019-06-21 10:55:37 +00:00
J. Ryan Stinnett
b5598df3f7
Remove redundant extra chevrons from ContextualMenu
...
This removes a seemingly redundant layer of extra chevrons from
`ContextualMenu`. Since both chevrons are the same color, there should be no
visual change.
2019-06-21 11:13:08 +01:00
Bruno Windels
503d702f47
take list nesting into account for indenting
2019-06-21 11:40:27 +02:00
Bruno Windels
da766b8cba
caretNode is a better className
2019-06-21 11:21:38 +02:00
Bruno Windels
c5c987f62e
use BOM marker instead of ZWS
...
that's what others do ...
2019-06-21 11:21:13 +02:00
J. Ryan Stinnett
d3b552411c
Merge pull request #3127 from matrix-org/t3chguy/file_upload_filesize
...
Add file size to UploadConfirmDialog
2019-06-21 09:19:27 +01:00
Michael Telatynski
dea412c906
Add file size to UploadConfirmDialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-21 09:03:28 +01:00
Travis Ralston
2a0660c545
Merge pull request #3123 from matrix-org/travis/sas-timeouts
...
Consider cancelled verifications when mounting IncomingSasDialog
2019-06-20 14:29:20 -06:00
Travis Ralston
0f8dd102bf
Move early-cancel stuff to constructor
2019-06-20 14:17:06 -06:00
Travis Ralston
55eec80771
Merge pull request #3124 from matrix-org/travis/sas-ok
...
Make the verification cancelled dialog say OK instead of Cancel
2019-06-20 07:58:38 -06:00
Bruno Windels
366a4aa308
put zero-width spaces in caret nodes so chrome doesn't ignore them
...
this requires an update of the editor DOM > text & caret offset logic,
as the ZWS need to be ignored.
2019-06-20 14:44:18 +02:00
David Baker
796a8a182f
Merge pull request #3125 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-06-20 11:03:05 +01:00
random
a03a2d5b0f
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1661 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-06-20 09:56:34 +00:00
Tirifto
a39420f72c
Translated using Weblate (Esperanto)
...
Currently translated at 83.3% (1384 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-06-20 09:56:33 +00:00
Jeff Huang
cbce373697
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1661 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-06-20 09:56:33 +00:00
Slavi Pantaleev
1d4089dda7
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (1661 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-06-20 09:56:32 +00:00
Travis Ralston
bf443149b5
Make the verification cancelled dialog say OK instead of Cancel
...
Fixes https://github.com/vector-im/riot-web/issues/9306
Includes unexpected cleanup of i18n
2019-06-19 15:07:45 -06:00
Travis Ralston
ff3c52a736
Consider cancelled verifications when mounting IncomingSasDialog
...
The cancellation can be because of a background problem, or because the user received another verification request from the same user. The cancel function does get called, however due to the speed of our dialog handling the state ends up being lost forever. Instead of trying to de-layer dialogs, this just fastforwards the whole dialog to "cancelled" on mount if required.
Fixes https://github.com/vector-im/riot-web/issues/10118
2019-06-19 14:59:59 -06:00
Weblate
a14505fe4c
Merge branch 'origin/develop' into Weblate.
2019-06-19 18:18:41 +00:00
J. Ryan Stinnett
b16a3c53cd
Merge pull request #3122 from matrix-org/jryans/slim-contextualmenu
...
Remove unused ContextualMenu features
2019-06-19 19:18:37 +01:00
Weblate
c8ae58e06e
Merge branch 'origin/develop' into Weblate.
2019-06-19 18:18:19 +00:00
J. Ryan Stinnett
78b0f61efe
Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button
...
Fix casing of TooltipButton
2019-06-19 19:18:15 +01:00
Bruno Windels
b16bc0178a
insert manually, as insertHTML command moves caret inconsistently
...
across browsers
2019-06-19 17:42:18 +02:00
Bruno Windels
f0271b593d
remove special casing for moving caret after newline and pills
...
not needed anymore with new caret logic and having caret nodes
2019-06-19 17:42:18 +02:00
Bruno Windels
a229641985
use caret nodes in caret positioning code, to move caret out of pills
2019-06-19 17:42:18 +02:00
Bruno Windels
607fc328ed
also process first part when processing empty and mergeable parts
...
this was preventing clearing an emtpy plain part when inserting
a pill-candidate at the beginning of the model, which
prevented a caret node from being inserted before the pill.
2019-06-19 17:42:18 +02:00
Bruno Windels
75fc769742
insert "caret nodes" where pills don't have an adjacent text node
...
just empty spans, where the caret can be placed.
2019-06-19 17:42:18 +02:00
Weblate
1af4587a69
Merge branch 'origin/develop' into Weblate.
2019-06-19 14:53:44 +00:00
Tuomas Hietala
dc947ab21c
Translated using Weblate (Finnish)
...
Currently translated at 99.4% (1651 of 1661 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-06-19 14:53:44 +00:00