David Baker
34adda590b
Merge pull request #1280 from matrix-org/luke/fix-rte-prevent-completion-pills-in-commands
...
Disable autocompletions for users and rooms when entering a command
2017-08-08 17:48:56 +01:00
David Baker
b76b6791b2
Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions
...
Always use message `body` when quoting
2017-08-08 17:47:25 +01:00
Luke Barnard
b82fd02eb7
Merge pull request #1281 from matrix-org/luke/fix-autocomplete-cancel
...
When `hide`ing autocomplete, also remove completion state
2017-08-08 17:46:48 +01:00
Luke Barnard
cb8a66b5a1
When hide
ing autocomplete, also remove completion state
2017-08-08 17:25:11 +01:00
Luke Barnard
a72f38799f
Disable autocompletions for users and rooms when entering a command
...
This only affects commands that take a room alias or user ID as an argument. (Leaving commands such as `/me` unaffected)
2017-08-08 15:58:15 +01:00
Luke Barnard
503fa6a7b3
Always use message body
when quoting
...
(not formatted_body)
This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756
2017-08-08 14:59:56 +01:00
David Baker
ca2273519d
Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting
...
Add optional setting for hiding avatars in <Pill>s
2017-08-08 14:01:34 +01:00
David Baker
08fba3bb75
Merge pull request #1278 from matrix-org/luke/fix-rte-key-bindings
...
Mandate ctrl/meta ONLY for a subset of key bindings
2017-08-08 13:51:02 +01:00
Luke Barnard
bef6726290
Lint
2017-08-08 13:42:51 +01:00
Luke Barnard
91a1cc4431
Mandate ctrl/meta ONLY for a subset of key bindings
...
Because by default dratf-js doesn't check that other modifiers are _not_ pressed.
2017-08-08 13:36:43 +01:00
Luke Barnard
b08d32371d
Add optional setting for hiding avatars in <Pill>s
...
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
2017-08-08 11:13:29 +01:00
David Baker
3639fc0c3c
Merge pull request #1276 from matrix-org/luke/fix-rte-completion-raw-disp-name
...
Use the rawDisplayName for the user provider completion
2017-08-08 10:38:24 +01:00
Luke Barnard
1743c047bd
Use the rawDisplayName for the user provider completion
...
to make sure that the length of text in the decoration (See <Pill>) is equal to the length of text in the completion (underlying text range that the Entity covers).
2017-08-08 10:28:11 +01:00
Luke Barnard
aa4cc882e9
Merge pull request #1275 from matrix-org/luke/fix-rte-ctrl-a-backspace
...
Fix ctrl+a, backspace toggling block format
2017-08-07 17:58:07 +01:00
Luke Barnard
7018deee44
Fix ctrl+a, backspace toggling block format
...
Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753
2017-08-07 17:16:42 +01:00
David Baker
8af6d6fc9f
Merge pull request #1274 from matrix-org/luke/fix-rte-keyboard-intercepts
...
Allow default for ctrl+shift+b, ctrl+shift+u in RTE
2017-08-07 16:38:04 +01:00
Luke Barnard
641fda0162
Adjust comment
2017-08-07 16:29:22 +01:00
Luke Barnard
d9d8f2055f
Allow default for ctrl+shift+b, ctrl+shift+u in RTE
...
fixes vector-im/riot-web#4750
2017-08-07 16:23:37 +01:00
Michael Telatynski
ffdffb643d
allow hiding of avatar/display name changes
2017-08-04 17:22:01 +01:00
Luke Barnard
91c96c1c27
Update draft-js-export-* deps to be compatible with draft-js >0.10.0
2017-08-04 15:08:03 +01:00
David Baker
fb8d6c962d
Use npm 6
2017-08-04 11:28:42 +01:00
David Baker
b06922b6fc
Merge pull request #1270 from matrix-org/luke/fix-md-unescaped-tokens
...
MD-escape URLs/alises/user IDs prior to parsing markdown
2017-08-04 10:30:30 +01:00
Luke Barnard
ee18ddb700
MD-escape URLs/alises/user IDs prior to parsing markdown
...
So that MD characters in them do not result in formatting being applied.
Fixes https://github.com/vector-im/riot-web/issues/3428
Fixes https://github.com/vector-im/riot-web/issues/4674
2017-08-04 10:02:22 +01:00
David Baker
ee5fc12cb0
Merge pull request #1269 from matrix-org/luke/upgrade-dep-draft-js-0.11.0
...
Upgrade draft-js to 0.11.0-alpha
2017-08-03 15:55:52 +01:00
Luke Barnard
a27eefd893
Fix a couple of more errors due to API changes
2017-08-03 15:20:44 +01:00
Luke Barnard
901cbf495d
Update decorator strategy API in accordance with recent changes to 0.11.0
...
See 590cdc6c54
, which is a change to the API not mentioned in the migration to v0.10 notes https://draftjs.org/docs/v0-10-api-migration.html
2017-08-03 12:02:29 +01:00
Luke Barnard
1d1cd5f691
Reflect API change for decorator strategy
2017-08-03 11:36:07 +01:00
Luke Barnard
fb5dc295aa
Reflect API change for getting an Entity
2017-08-03 11:29:26 +01:00
Luke Barnard
124795006c
Reflect API change for creating an Entity
2017-08-03 11:18:56 +01:00
Luke Barnard
4f0cf7d6ec
Update npm dep of draft-js to 0.11.0-alpha
2017-08-03 11:16:32 +01:00
Richard Lewis
5752345b80
Merge pull request #1263 from matrix-org/rxl881/warnings
...
Display warning if widget is mixed content
2017-08-02 17:30:46 +01:00
Richard Lewis
7599bde1f6
Fix logging line length.
2017-08-02 17:05:46 +01:00
Luke Barnard
700dd51584
Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks
...
Account for `\n` after each block
2017-08-02 16:41:47 +01:00
Kegan Dougal
c914f1607b
scalar-develop is a scalar URL
2017-08-02 14:35:14 +01:00
Luke Barnard
1512aff326
Add comments
2017-08-02 11:06:02 +01:00
Luke Barnard
2c86086444
Account for \n
after each block
...
when converting from text offsets to selection state.
fixes vector-im/riot-web#4728
2017-08-02 10:51:34 +01:00
Luke Barnard
9010f96e60
Merge pull request #1266 from matrix-org/luke/fix-ac-providers-sort
...
When sorting completions, use matched string, not entire query
2017-08-02 10:36:47 +01:00
Luke Barnard
72c1cf9288
When sorting completions, use matched string, not entire query
...
Otherwise the results vary depending on where you start autocompleting in your message. We only care about the matched string.
2017-08-02 10:09:00 +01:00
Luke Barnard
b632c9132c
Merge pull request #1265 from matrix-org/luke/fix-room-completions-order
...
Order room completions more intuitively
2017-08-02 10:05:17 +01:00
Luke Barnard
dbade448c1
Don't try to match query against roomId
...
We only care about aliases.
2017-08-02 09:40:00 +01:00
Luke Barnard
8053d2933a
Order room completions more intuitively
...
by index of the query in displayedAlias and then length of displayedAlias. (So that aliases where the query appears earlier in the string appear first and if the query is in the same index for two aliases, the shorter one appears first).
2017-08-02 09:35:07 +01:00
Richard Lewis
48faf72fdc
Disable eslint rule
2017-08-01 21:00:18 +01:00
Luke Barnard
ff378cc85a
Merge pull request #1264 from matrix-org/luke/fix-rte-emoji-sorting
...
Adjust emoji sorting such that exact matches/prefixes appear first
2017-08-01 17:58:54 +01:00
Richard Lewis
2ab6bc84a7
Improve clarity
2017-08-01 17:49:41 +01:00
Richard Lewis
f0224460d2
Fix comparison and handle case where app has permission to load but content is mixed protocol.
2017-08-01 17:48:02 +01:00
David Baker
e6f3164348
Merge pull request #1262 from matrix-org/luke/upgrade-dep-draft-js
...
Upgrade draft-js from 0.9.1 to 0.10.1
2017-08-01 17:46:09 +01:00
Richard Lewis
d29610bdd2
Fix boolean comparison.
2017-08-01 17:45:06 +01:00
Richard Lewis
f57b0d4cc7
Fix invalid translation
2017-08-01 17:43:38 +01:00
Luke Barnard
ff95542549
Adjust emoji sorting such that exact matches/prefixes appear first
...
fixes https://github.com/vector-im/riot-web/issues/4704
2017-08-01 17:36:41 +01:00
Richard Lewis
bc4d979d1e
Display warning if widget is mixed content
2017-08-01 17:29:29 +01:00