mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 02:51:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
14065 commits 219 branches 562 tags 474 MiB
Commit graph

2295 commits

Author SHA1 Message Date
Bruno Windels
c0becc7664 fix roomtile badge 
only put it in the dom if it has
anything to show as it has a border now in collapsed mode
 2018-11-05 14:24:12 +01:00
Bruno Windels
3cd32e2f44 update search icon(s) 2018-11-05 13:07:49 +01:00
Bruno Windels
064662380f support search icon in mx_textinput, use in memberlist 2018-11-05 09:35:27 +01:00
Bruno Windels
46389457e3 add input styling for light and dark panels (leftpanel vs room header) 2018-11-05 09:32:37 +01:00
Bruno Windels
e29227db4e bring back "filter rooms" field 
this does the filtering in RoomList instead of RoomSubList, so
we can hide sections that don't have any results.

The filtering does happen with every rerender of RoomList,
but only does something while searching, so the performance
implications are probably negligible.
 2018-11-02 15:27:17 +01:00
Bruno Windels
b4dd739771 Merge branch 'experimental' into bwindels/rightpanelbelowheader 2018-10-31 14:57:16 +01:00
Bruno Windels
ba83166661 Merge branch 'develop' into experimental 2018-10-31 14:54:22 +01:00
Bruno Windels
e80a1c5051 move room/group panel header buttons into room/group header 2018-10-30 17:15:19 +01:00
Aaron Raimist
49ce4ef117
eslint --fix src/ 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:50:38 -05:00
David Baker
156ffd1334 Fix autoreplacement of ascii emoji 
More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
 2018-10-26 17:01:44 +01:00
Bruno Windels
2c039483c6 Merge branch 'develop' into experimental 2018-10-26 15:33:39 +02:00
David Baker
85bb8392c4
Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement 
Fix emoji replacement in composer
 2018-10-25 16:23:13 +01:00
David Baker
5e81e5b8b8 Fix variable scope 2018-10-25 15:07:19 +01:00
David Baker
401f6333ed Do...while loops are a thing 2018-10-25 14:54:32 +01:00
David Baker
adee0fdcef
Merge pull request #2248 from matrix-org/bwindels/memberpanel 
Redesign: basic makeover of member info panel
 2018-10-25 14:52:54 +01:00
Bruno Windels
3096bf42ef fix css in chrome 2018-10-25 15:20:51 +02:00
Bruno Windels
030deba90c avoid downloading avatars at full resolution 2018-10-25 15:20:33 +02:00
Will Hunt
8118a9c71a Wall devtools button behind a setting 2018-10-24 18:15:35 +01:00
Will Hunt
44a41b589d Comma on strings and styling button 2018-10-24 17:50:27 +01:00
Will Hunt
79d467c551 Add button to open devtools in roomsettings 2018-10-24 17:36:58 +01:00
Bruno Windels
e4dfb90b85 basic makeover of member panel with big avatar 2018-10-24 18:23:34 +02:00
Bruno Windels
873ff7fc29 make EntityTile responsive 2018-10-24 18:22:57 +02:00
David Baker
78d8d22457 Fix emoji replacement in composer 
* Re-scan the slate document tree on each emoji replacement since
   doing a replacement will invalidate all the offsets we have.
 * Reset the emoji regex each time we use it.

Fixes https://github.com/vector-im/riot-web/issues/7550
 2018-10-24 16:46:06 +01:00
Bruno Windels
7244d30c9c guard against empty roomId/non-existant room 2018-10-24 16:44:18 +02:00
Bruno Windels
8c62dddb32 one big commit, sorry 
changing looks of input & buttons
changing background color of right panels
moving invite button around
change margins and paddings in memberlist
 2018-10-24 13:50:58 +02:00
Bruno Windels
5425eda438
Merge pull request #2241 from matrix-org/bwindels/redesignicons1 
Redesign: update (most) icons
 2018-10-23 19:40:59 +00:00
Bruno Windels
eb453f4539 make icons in composer smaller, better spacing 2018-10-23 18:11:15 +02:00
Bruno Windels
18fedb23ec fix basic room header layout 
make room name take as much space as it needs (but not more than width)
put all items apart from right buttons in one flex container
 so name and topic can grow as required
more small tweaks
 2018-10-23 16:57:56 +02:00
Travis Ralston
78f527cf95 Remove unused classes 2018-10-22 15:14:21 -06:00
Bruno Windels
ebd3d34106 make sure no resize handle is put after last sublist 2018-10-19 18:35:27 +02:00
Bruno Windels
c6924c47fa no need for self 2018-10-19 14:43:54 +02:00
Bruno Windels
d48f19bc19 remove alwaysShowHeader, as now onAddRoom prop determines this 2018-10-19 14:43:02 +02:00
Bruno Windels
5091aa3b43 get rid of emptyContent, also cleanup sublist render method 
also assume empty list in css by default and add nonEmpty class
 2018-10-19 14:41:51 +02:00
Bruno Windels
0386a1e048 get rid of obsolete showEmpty prop 2018-10-19 14:32:49 +02:00
Bruno Windels
ae8723451a remove onShowMoreRooms, as room tiles & scrollbar rendered at same level 2018-10-19 14:27:36 +02:00
Bruno Windels
f14c2cf2b2 don't hide empty sections that have a (+) button 2018-10-19 12:46:59 +02:00
Bruno Windels
6af61ebb09 add plus button for rooms and people 2018-10-19 12:07:36 +02:00
Bruno Windels
d264687796 don't scroll sub list header 2018-10-18 16:25:22 +02:00
Bruno Windels
01082c8595 hook up resizer events 2018-10-18 15:51:58 +02:00
Bruno Windels
39ab3d86bd create sizer that sets item size with flex-basis 
works with the flex-grow we set initially for the sub lists
 2018-10-18 15:51:22 +02:00
Bruno Windels
c1e602d56f scrollbars and resize handles around room sub lists 2018-10-18 15:19:45 +02:00
Bruno Windels
99982b1164 put repeated props in process function 2018-10-18 15:15:56 +02:00
Bruno Windels
c12368ea48 process RoomSubList props through function before creating them 
this way, we'll be able to add adjacent resize handles and scroll wrappers
 2018-10-18 15:09:58 +02:00
Bruno Windels
81d0ce2bcf remove sticky header code 2018-10-18 15:08:32 +02:00
Travis Ralston
af8dfda9a7 Add a bit of text to explain the purpose of the RoomPreviewSpinner 
Fixes https://github.com/vector-im/riot-web/issues/5869
 2018-10-17 13:53:12 -06:00
Bruno Windels
6906d5a5f9 remove DND for room tiles 2018-10-17 16:02:35 +02:00
Bruno Windels
cc29dd08da don't always show badge (leftover) 2018-10-16 14:54:14 +02:00
Bruno Windels
01471abdc5 Merge branch 'bwindels/redesign' into bwindels/resizehandles 2018-10-16 11:57:59 +02:00
Bruno Windels
6878ce3c6a Merge branch 'develop' into bwindels/redesign 2018-10-16 11:57:44 +02:00
Will Hunt
5a72a5863f Merge remote-tracking branch 'upstream/develop' into hs/upload-limits 2018-10-15 19:20:55 +01:00
Aaron Raimist
9f1b1d2028
Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:50:24 -05:00
Aaron Raimist
a66dbccef8
Fix lint errors in MessageComposerInput.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:46:55 -05:00
David Baker
3efc09586b More API changes 2018-10-11 10:47:36 +01:00
David Baker
4d1f2cdfa9 Fix quote post slate update 
Missed API update
 2018-10-11 10:29:55 +01:00
Bruno Windels
dfb4c594a8
Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars 
Fall back to default avatar in RR when member isn't loaded yet
 2018-10-10 16:58:59 +02:00
Bruno Windels
0767c278e7 put userId next to member in read receipt, fall back when member missing 2018-10-10 16:14:09 +02:00
David Baker
97ed4ed0bb
Merge pull request #2202 from matrix-org/dbkr/update_slate 
Update to new version of slate
 2018-10-10 11:10:20 +01:00
David Baker
4e1fabd140 Remove spurious ...atributes in the wrong place 
We already have it above
 2018-10-09 16:05:14 +01:00
David Baker
41bc42e7d7
Merge pull request #2194 from pvagner/more_accessible_buttons 
More accessible buttons - take 2
 2018-10-09 11:04:50 +01:00
David Baker
c1f51a76dd Update to new version of slate 
Lots of fixes here as a lot of the API has changed (eg. anchorKey /
offsetKey are now anchor.key and offset.key, and collapseFocusToThing
is moveFocusToThing).

Also changes the ref to a function (sorry for lumping this into the
same PR).

Hopefully will fix https://github.com/vector-im/riot-web/issues/7105
 2018-10-09 10:55:55 +01:00
Will Hunt
17915b5082
Merge branch 'develop' into hs/purge-irc-hack 2018-10-03 19:39:14 +01:00
Will Hunt
fe788486b7 Drop (IRC) suffix hacks 2018-10-03 19:34:06 +01:00
Peter Vágner
e05ae29146
Also fix accessibility of sticker buttons 2018-10-02 20:19:21 +02:00
Peter Vágner
ded35e43a0
A11y: repurpose more divs into AccessibleButtons. 
With this more of the
controls that look like buttons can be operated via the keyboard and
navigated to by screen reader users. This includes editor buttons such
as File upload, Audio / Video call, Right pannel hide button, Jump to
the bottom timeline button, and some more buttons found in the user
settings.
Also I have added alt texts to some images that in turn label buttons
which these happen to be packed in and removed some untranslated alt
texts from decorative non-actionable images that might add more
verbosity when talking about screen reader user experience.
 2018-10-02 13:55:24 +02:00
Bruno Windels
928b6d47c8 add resize handles between 3 main app columns 2018-09-24 16:07:42 +01:00
Bruno Windels
91ec96c8d3 Merge branch 'develop' into bwindels/redesign 2018-09-21 12:44:44 +02:00
Matthew Hodgson
0f806d5b99 Merge branch 'develop' into matthew/canonical_aliases 2018-09-20 01:45:08 +01:00
Matthew Hodgson
c6fa8ea24c show canonical aliases in timeline, and set/remove implicit ones 2018-09-20 01:07:01 +01:00
Bruno Windels
920e0d397c Merge branch 'develop' into bwindels/fixstalerr 2018-09-19 12:15:41 +02:00
Matthew Hodgson
d39889e2cf
Merge pull request #2167 from matrix-org/t3chguy/m.room.aliases 
Add m.room.aliases to the timeline
 2018-09-18 11:14:44 +01:00
Matthew Hodgson
ece041d059 fix NPE on name (related to LL?) 2018-09-18 00:16:25 +01:00
Bruno Windels
8c4f4765df remove initial parameter and show available members on invite instead 2018-09-17 20:03:01 +02:00
Bruno Windels
0727e0f8d3 mounted can be set straight in componentWillMount 2018-09-17 20:02:15 +02:00
Bruno Windels
e8b4770940 fix lint 2018-09-17 20:01:55 +02:00
Bruno Windels
e0a789f77e remove untrue comment, as we only load the members when joining 2018-09-17 19:21:22 +02:00
Bruno Windels
e1b9aa9626 better naming and document method 2018-09-17 19:20:26 +02:00
Matthew Hodgson
dc7212ec2b switch back to simple TextForEvent 
I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.
 2018-09-17 18:20:12 +01:00
Bruno Windels
d276b17c2a remove dead code 2018-09-17 19:19:07 +02:00
Bruno Windels
c3914d3493 show empty list as initial state instead of spinner 
the spinner should only be shown when joined
 2018-09-17 19:18:55 +02:00
Bruno Windels
2ed414494f use Room.myMembership event instead of RoomMember.membership for me 
This is more reliable with LL enabled as the syncing user is
only known when it was active in the current timeline
or when the members have been loaded
 2018-09-17 19:14:52 +02:00
Matthew Hodgson
3b868064c7 merge in develop 2018-09-16 19:06:52 +01:00
Bruno Windels
27c496aecb remove unneeded async keywords 2018-09-14 13:55:47 +02:00
Bruno Windels
f194f323f4 postpone loading the members until the user joined the room 
when peeking, the members weren't being loaded at all because
the room wasn't available yet,
and the need for loading the members was never re-evaluated after that.

This only loads the members once the user has joined the room,
which also helps to avoid load all the members before an invite
is accepted.
 2018-09-13 18:43:24 +02:00
Bruno Windels
ecaabd6b75
Merge pull request #2161 from matrix-org/bwindels/dontupdatememberlistwhileloading 
avoid updating the memberlist while the spinner is shown
 2018-09-11 10:57:29 +02:00
Bruno Windels
2aaf3e6b89 dont assign member in getInitialState 2018-09-10 17:39:03 +02:00
Bruno Windels
92f7e29132 missed one {} -> [], fix e2e tests 2018-09-10 17:32:40 +02:00
Bruno Windels
5044d4f2d6 dont keep the spinner in the memberlist when fetching /members fails 2018-09-10 14:56:10 +02:00
Bruno Windels
0cd222ef0b make users available in member by requesting them from client right before 
before this was already foreseen, but memberDict wasn't being refreshed
as it's only used in roomMembers(), I got rid of memberDict as well
 2018-09-07 23:44:20 +02:00
Bruno Windels
7fe822ca17 Merge branch 'develop' into bwindels/dontupdatememberlistwhileloading 2018-09-07 23:43:25 +02:00
Bruno Windels
467cdd2f1f Merge branch 'develop' into bwindels/optimizememberlist 2018-09-07 18:32:13 +02:00
Bruno Windels
9cc9fbf924 avoid memberlist refresh for events related to rooms other but the current 2018-09-07 14:05:26 +02:00
Bruno Windels
fec7d2ee5f avoid updating the memberlist while the spinner is shown 
the memberlist gets updated constantly while the LL members
are being added to the room state. this slows things down unneed, and is one of the
main cause of dropping frames when member arrive.
 2018-09-07 12:00:19 +02:00
David Baker
c8ab8bf5f8
Merge pull request #2150 from matrix-org/dbkr/disable_ilag_if_unsupported 
Do full registration if HS doesn't support ILAG
 2018-09-06 16:23:32 +01:00
Bruno Windels
26df485607 Merge branch 'develop' into revert-2149-revert-2145-bwindels/fixllroompermission 2018-09-06 15:35:41 +02:00
David Baker
4c8d2de563
Revert "Revert "Don't rely on room members to query power levels"" 2018-09-06 11:48:23 +01:00
David Baker
9e64a22884 s/DidMount/WillMount/ in MessageComposerInput 
This fixes the tests that broke with https://github.com/matrix-org/matrix-js-sdk/pull/717

This is because of https://github.com/vector-im/riot-web/blob/master/test/app-tests/joining.js#L63
which prevents the DOM nodes from actually ending up in the DOM, even though the react components
get rendered. This means that WillMount and WillUnmount are called, but not DidMount.

Using WillMount is more symmertrical anyway since the resulting teardown code must be in
WillUnmount (since there is no DidUnmount).
 2018-09-06 11:44:13 +01:00
David Baker
27fa21e403 Replace view_set_mxid with require_registration 
To put all the other flows through the to-ilag-or-not-to-ilag flow
 2018-09-05 18:08:49 +01:00
David Baker
34d27954cf
Revert "Don't rely on room members to query power levels" 2018-09-05 18:03:48 +01:00
Bruno Windels
8500a7131f avoid unneeded lookups in memberDict 
have members be an array of RoomMember instead of userId, so
we can avoid multiple lookups when sorting, rendering, ...
 2018-09-05 15:25:08 +02:00
Bruno Windels
50de22fb51
Merge pull request #2145 from matrix-org/bwindels/fixllroompermission 
Don't rely on room members to query power levels
 2018-09-05 13:07:55 +02:00
Bruno Windels
be66f98381 use room method for checking power levels 
as it is always are of the syncing user's membership
in case of lazy loading members
 2018-09-04 15:35:44 +02:00
Bruno Windels
1eabb6012a
Merge pull request #2139 from matrix-org/bwindels/memberlist-spinner 
Show spinner in member list while loading members
 2018-09-03 15:05:27 +02:00
Bruno Windels
cae419e304 avoid rerendering when LL is disabled 2018-09-03 11:13:56 +02:00
David Baker
2c1ba6f104
Merge pull request #2124 from matrix-org/dbkr/tombstone 
Support m.room.tombstone events
 2018-08-29 18:38:48 +01:00
David Baker
c40ac49b2a Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate 2018-08-29 18:18:08 +01:00
David Baker
bd0a9cf3a0 Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade 2018-08-29 15:51:07 +01:00
Bruno Windels
f9c40390e9 set state after setting _showPresence to avoid all members to appear offline on matrix.org 2018-08-29 11:09:55 +02:00
Bruno Windels
e9e5abfcc5 show a spinner in the memberlist while loading the members 2018-08-29 10:30:25 +02:00
David Baker
98dabe1a46
Merge pull request #2132 from matrix-org/bwindels/fixllcomposeravatar 
Fix LL crash trying to render own avatar in composer when member isn't available yet
 2018-08-23 12:41:18 +01:00
David Baker
06ffc70aa4
Merge pull request #2127 from matrix-org/dbkr/hide_replaced_rooms 
Hide replaced rooms
 2018-08-23 09:33:40 +01:00
Bruno Windels
37e60e4fc4 wait for members loading to finish to show the avatar in the composer 2018-08-23 00:02:20 +02:00
David Baker
f679acea08
Revert "Revert "Fix showing peek preview while LL members are loading"" 2018-08-22 16:35:58 +01:00
David Baker
bf7633250a
Revert "Fix showing peek preview while LL members are loading" 2018-08-22 16:16:17 +01:00
Bruno Windels
860c6355f0 do self membership checks with getMyMembership elsewhere as well 2018-08-22 14:06:28 +02:00
David Baker
b7570002e0 Hide replaced rooms 
By using new getVisibleRooms() in js-sdk
 2018-08-22 12:01:29 +01:00
David Baker
8d6d1be992 Typo 2018-08-21 16:40:04 +01:00
David Baker
7f8cd203a8 Support m.room.tombstone events 
For https://github.com/vector-im/riot-web/issues/7164
 2018-08-21 15:56:56 +01:00
David Baker
ab10b5493b Support room creation events 
For https://github.com/vector-im/riot-web/issues/7164
 2018-08-20 16:20:59 +01:00
David Baker
9f19896df0 Support for room upgrades 
* Show when a room upgrade is needed
 * Dialog box to perform the upgrade
 2018-08-17 14:54:43 +01:00
Bruno Windels
cead4096d8
Merge pull request #2118 from matrix-org/bwindels/feature_lazyloading 
Lazy loading of room members
 2018-08-16 18:14:55 +02:00
David Baker
c736ae7efb Copyright 2018-08-14 16:53:34 +01:00
David Baker
f20920718a Show room version number in room settings 
Also change wording of the Room ID bit to match

Requires https://github.com/matrix-org/matrix-js-sdk/pull/689
For https://github.com/vector-im/riot-web/issues/7164
 2018-08-14 14:28:30 +01:00
David Baker
05bf200a72 Don't crash if scrollbars updated before init 
The initialisation here is done on a timer to allow the DOM
elements to be in place before it's run, so it's possible for an
update to happen ebfore the initialisation. Stop & bail out if
there is no this.stickies.
 2018-08-13 13:49:22 +01:00
David Baker
f44cc8e66e
Merge pull request #2112 from matrix-org/dbkr/recognise_server_notices_room 
Recognise server notices room(s)
 2018-08-07 09:52:25 +01:00
David Baker
b5ce1ac5e1 Recognise server notices room(s) 
and put them in their own section at the bottom
 2018-08-06 18:00:40 +01:00
David Baker
b2302af708 Update room tags behaviour to match spec more 
Fix Riot's behaviour with room tags after my cleanup in
https://github.com/matrix-org/matrix-doc/pull/1457 . Although, reading
it again, it's not clear how you're supposed to tell the difference
between a reverse-dns tag name and a legacy freeform text tag
(contains a '.'?) - I've left it detecting these as freeform text
for now.
 2018-08-06 16:58:54 +01:00
Bruno Windels
802efc7694 given the != join check, isInvite will never be true 
Also, put comments in right order
 2018-08-02 11:47:24 +02:00
Bruno Windels
908de56c6d replace getMember(myId).membership with getMyMembership 
This works with rooms which haven't had their members
loaded yet.
 2018-08-02 11:42:05 +02:00
Matthew Hodgson
fe73953d9d fix merge; disable sticky headers; tweak chevrons 2018-07-30 09:00:11 -07:00
Matthew Hodgson
9783b6100d Merge branch 'develop' into matthew/dharma 2018-07-29 17:03:23 +01:00
Michael Telatynski
f264075369
null-guard history properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-26 17:11:32 +01:00
Michael Telatynski
265e4267b8
remove faulty onBlur/onFocus code which caused selection to rollback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-26 15:00:43 +01:00
Bruno Windels
d87d34030a fix dm detection and conf call code with lazy loading 2018-07-25 16:10:49 +02:00
Bruno Windels
f79e2eae40 might not have loaded members here yet 2018-07-25 16:10:49 +02:00
Bruno Windels
866b4bb067 use isKicked method in preview bar 2018-07-25 16:10:49 +02:00
Bruno Windels
8c9ceca14f take into account lazy loading when enlarging avatar 2018-07-25 16:10:49 +02:00
Michael Telatynski
020e714b85
fix focus and too many <p>s after a Event>Quote in RT mode 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 15:54:24 +01:00
Michael Telatynski
afa19cd60d
make clicking autocomplete suggestions work again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 13:48:05 +01:00
David Baker
b8ca65627b
Merge pull request #2076 from matrix-org/t3chguy/slate_cont2 
Slate Fixes
 2018-07-23 17:25:51 +01:00
Michael Telatynski
93abb4b74b
workaround to prevent Slate getting too empty when undoing RT pastes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-20 15:06:27 +01:00
David Baker
f9af96d422
Merge pull request #2070 from matrix-org/t3chguy/slate_cont2 
Even More Slate Fixes :D
 2018-07-19 13:49:42 +01:00
Michael Telatynski
855f8871b8
replace heuristic for the time being as it failed with inlines like pills. Fixes vector-im/riot-web#7059 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 16:50:07 +01:00
Michael Telatynski
88dddb628d
in MD mode forgo any Magic Rich Pasting conversion as its confusing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 11:50:13 +01:00
Michael Telatynski
6bb88c0548
attempt to fix clash of Cmd-M on Mac. Should fix vector-im/riot-web#7047 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 11:28:48 +01:00
Michael Telatynski
3e956514b3
also prevent merge/skip on rich text pastes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 11:00:45 +01:00
Michael Telatynski
1a9de3fabe
fix undo on pasting plaintext content 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:58:27 +01:00
Michael Telatynski
f5856270cc
undo removal of stripping <p>s as it breaks HTML /mes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:48:54 +01:00
David Baker
68c46a694e lint 2018-07-18 10:18:55 +01:00
Michael Telatynski
19e5dc5799
do less rewriting for composer quote to prevent breaking pills 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:10:42 +01:00
Michael Telatynski
8bb08b1b75
fix focus on new editorState as it didn't have focus so broke when alt tab 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:10:11 +01:00
David Baker
7aab6fa6f1 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-18 09:35:57 +01:00
Matthew Hodgson
02c3bc9476
Merge pull request #2069 from matrix-org/t3chguy/slate_cont2 
Moar Slate Fixes
 2018-07-17 17:15:01 +01:00
Michael Telatynski
720a728278
workaround for placeholder being shown when empty text but block. Fixes vector-im/riot-web#7042 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 16:13:33 +01:00
Michael Telatynski
1b467f6ca8
fix pasting of plaintext content (prevent loads of <p>s) Fixes vector-im/riot-web#7043 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 16:02:37 +01:00
Michael Telatynski
414908611d
prevent exception if there is no text node at anchor 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 13:48:15 +01:00
Michael Telatynski
688776bc10
allow enter to remove current block if its empty useful for lists 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 13:29:40 +01:00
Michael Telatynski
8d4cead105
special-case 'inline-code' button because mark is called 'code' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 13:24:28 +01:00
Michael Telatynski
ff76b6a981
allow user to break out of blockquote/etc by hitting enter twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 12:30:22 +01:00
Matthew Hodgson
48fbf1406f
Merge pull request #2068 from matrix-org/t3chguy/slate_cont2 
fix 2nd typo in one PR :(
 2018-07-16 21:36:57 +01:00
Michael Telatynski
1c24f1fd5a
fix 2nd typo in one PR :( 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 21:34:25 +01:00
Matthew Hodgson
8c17ee7281
Merge pull request #2067 from matrix-org/t3chguy/slate_cont2 
check if has some completions, not if >=0
 2018-07-16 21:32:04 +01:00
Michael Telatynski
547e0ed52c
check if has some completions, not if >=0 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 21:30:04 +01:00
Matthew Hodgson
a5b932bfdd
Merge pull request #2066 from matrix-org/t3chguy/slate_cont2 
Slate fixes
 2018-07-16 21:29:20 +01:00
Michael Telatynski
3000099991
add additional checks for hiding autocomplete to prevent text calculation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 21:27:52 +01:00
Michael Telatynski
bdbc2cbd38
disable spellCheck when the placeholder is shown because "unencrypted" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 18:32:50 +01:00
Michael Telatynski
c7859fed1a
add heuristic to compare documents to prevent autocomplete flicker 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 18:27:06 +01:00
David Baker
a79caed0c9 Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms 2018-07-16 17:21:51 +01:00
David Baker
379d65bd6c
Merge pull request #2064 from matrix-org/t3chguy/slate_cont2 
simplify MessageComposerStore and improve its performance
 2018-07-16 17:20:48 +01:00
Michael Telatynski
2f1779751b
make the MessageComposerStore stateless for better performance 
and inter-tab composition (by simplifying it. WIN-WIN)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 16:56:08 +01:00
David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate 
Replace Draft with Slate
 2018-07-16 14:16:25 +01:00
David Baker
4c6419a3c5 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-16 13:24:13 +01:00
David Baker
ff96537048 lint 2018-07-16 11:49:53 +01:00
Michael Telatynski
4850387ae0
add null-guard for stickerpickerWidget in StickerPicker 2018-07-13 14:24:29 +01:00
Bruno Windels
7bbb967ddd
Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen 
Implement always-on-screen capability for widgets
 2018-07-13 11:14:37 +01:00
David Baker
e56feea9ec Put always-on-screen widgets in top left 
always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.

Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
 2018-07-12 18:43:49 +01:00
David Baker
5a5e967262 Fix avatars vanishing on hover 
Turns out the z-index was to make the avatar appear above the
EventTile_line even though it comes before in the DOM (it's
absolutely positioned to overlap with it). Instead, just put
it afterwards in the DOM.
 2018-07-12 17:48:49 +01:00
Michael Telatynski
7405c5eff2
specify alternate history storage key to prevent conflicts with draft 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-12 16:35:42 +01:00
David Baker
8f10ee01c6 Implement always-on-screen capability for widgets 
As per https://github.com/matrix-org/matrix-doc/issues/1354

This is whitelisted to only jitsi widgets for now as per comment,
mostly because any widget that we may make always-on-screen we need
to preemptively put in a PersistedElement container, which is
unnecessary for any other widget.

Apologies that this does a bunch of refactoring which could have
been split out separately: I only discovered what needed to be
refactored in the process of doing this.

Fixes https://github.com/vector-im/riot-web/issues/6984
 2018-07-11 18:07:32 +01:00
Michael Telatynski
b4bc09c335
null-guard savedState since now we're accessing its props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 17:13:33 +01:00
Michael Telatynski
3e05bf19c5
hide autocomplete when moving caret to match existing behaviour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 16:30:45 +01:00
Michael Telatynski
95909de446
fix MessageComposer not marking translatable strings. run gen-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 11:39:55 +01:00
Michael Telatynski
c3aef6e3a0
workaround for tommoor/slate-md-serializer#14 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 10:29:14 +01:00
Michael Telatynski
fd4f9679df
convert md<->rt if the stored editorState was in a different state 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 09:43:39 +01:00
Bruno Windels
3e14cd2190
Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling 
fix nullguard on EventTile, getComponent never returns falsey, it throws
 2018-07-11 09:12:49 +01:00
Michael Telatynski
abbb69dc36
fix fn call, fixes usage of SlashCommands 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 17:35:13 +01:00
David Baker
25e453badd Fix stickerpicker PersistedElement usage 
Earlier PR changed the prop to persistKey in PersistedElement but
containerId here, so this was ending up as 'undefined'.
 2018-07-10 17:32:17 +01:00
Michael Telatynski
100ecfe7ce
remove trailing spaces to make linter happy (no-trailing-spaces) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 10:29:52 +01:00
Michael Telatynski
58301e5dd4
navigateHistory only when at edges of document, to prevent Firefox bug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 10:28:17 +01:00
Matthew Hodgson
51591a4d62 fix lint 2018-07-09 20:49:31 +01:00
Matthew Hodgson
ffec1b5a95 fix lint 2018-07-09 20:11:17 +01:00
Matthew Hodgson
0d0934add7
unbreak modifier+space (e.g. emoji insert on macOS) 
(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:58:04 +01:00
Matthew Hodgson
021409aafe
apply review feedback from @lukebarnard1 
(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:54:57 +01:00
Michael Telatynski
5b74c615ae
add missing import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:42:57 +01:00
Michael Telatynski
43204ea177
fix Control-Backspace after select-all 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:42:10 +01:00
Michael Telatynski
faf17f06c6
remove debugger statement 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:36 +01:00
Michael Telatynski
483116fb03
add rule to slate-md-serializer: make underlined and removed work for CM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:29 +01:00
Michael Telatynski
372fa29ad3
take edge into consideration when moving focus region on arrow keys 
fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0982617)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:20 +01:00
Michael Telatynski
c6837af398
import-type Change from slate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:00 +01:00
Matthew Hodgson
efdc5430d7 merge develop 2018-07-09 17:50:07 +01:00
Will Hunt
a6cff4a969 Show server bans in the timeline 2018-07-06 11:06:31 +01:00
David Baker
b6f854abe4 Simplify event name as it's the only one 2018-07-05 20:00:42 +01:00
David Baker
eb552e5cef Just pass the roomId into WidgetEchoStore 2018-07-05 18:43:20 +01:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist 2018-07-04 11:21:16 +01:00
David Baker
ad35fbf208 Pull out z-index to the sticker picker 
As it's not a thing that's necessary for other PersistedElements,
only the sticker picker because it has to sit above the ContextMenu
it sits in.
 2018-07-03 18:25:33 +01:00
David Baker
3f88721bc1 Give PersistedElement a key 
So there can be more than one on a page
 2018-07-03 14:43:27 +01:00
David Baker
8b64ddcbe8 Do some level of local echo for widgets 
* Show a spinner while we wait for widgets to be deleted
 * Hide widgets while they're pending deletion
 * Don't put another jitsi widget into the room if there's already
   one pending
 2018-07-03 11:16:44 +01:00
Michael Telatynski
37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:07:28 +01:00
Michael Telatynski
ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute 2018-06-29 19:17:43 +01:00
Michael Telatynski
85a0736c78
update wording as per D4ve's feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 19:16:56 +01:00
Michael Telatynski
322b77b57f
don't throw, console.warn + dummy render instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 12:54:36 +01:00
Michael Telatynski
55f4f1723d
fix nullguard on EventTile, getComponent never returns falsey, it throws 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-27 11:44:11 +01:00
David Baker
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist 
fix historical section
 2018-06-26 18:26:29 +01:00
David Baker
fddb576c3a
Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize 
Fix RoomSubList headers by re-commiting 1faecfd
 2018-06-26 18:23:38 +01:00
Michael Telatynski
f40802e9d8
Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop 
don't fire share dialog when clicking timestamp of event,
 2018-06-26 17:46:52 +01:00
Michael Telatynski
67f803bc5f
don't fire share dialog when clicking timestamp of event, 
it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 16:59:49 +01:00
David Baker
0ee8d18f5a More code de-duping 2018-06-26 16:41:44 +01:00
David Baker
6cf11a15e6 Move WidgetUtils to utils dir 2018-06-26 11:59:16 +01:00
David Baker
0f2c47937c Merge the two different widget utils files 2018-06-26 11:52:21 +01:00
Michael Telatynski
f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
 2018-06-26 07:51:16 +01:00
Michael Telatynski
9b50daa748
give Historical an emptyContent to make it look more consistent 
and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:46:33 +01:00
Luke Barnard
e292ee942f Fix RoomSubList headers by re-commiting 1faecfd 
The original got reverted in ebfafb36 somehow.
 2018-06-25 16:37:45 +01:00
Luke Barnard
a24cb8e678
Merge pull request #2008 from matrix-org/t3chguy/focus_composer 
fix instances of composer not getting/regaining focus
 2018-06-25 10:22:29 +01:00
Luke Barnard
383dccebb4
Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes 
notif panel fixes
 2018-06-25 09:53:24 +01:00
Michael Telatynski
e1ba6949d0
expand composer input focus region and apply cursor:text to it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 16:40:53 +01:00
Will Hunt
541f1d71fb Move upload verification logic to RoomView. 
Improve upload dialog ux
 2018-06-23 14:28:39 +01:00
Will Hunt
caf2086585 Restructure limits to be set at RoomView, so they may change if the 
upload fails
 2018-06-23 13:00:56 +01:00
Will Hunt
76f0f15e49 Fix nitpicks 2018-06-23 13:00:56 +01:00
Will Hunt
7c0811dd92 size > upload_size as per spec feedback 2018-06-23 13:00:56 +01:00
Will Hunt
0fad90eb43 Linting 2018-06-23 13:00:56 +01:00
Will Hunt
c99f5c0df8 Check upload limits before trying to upload large files 2018-06-23 13:00:56 +01:00
Michael Telatynski
aff2cc9065
EventTile:notif apply EmojiText to room name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:21:42 +01:00
David Baker
6252f5b818 Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget 2018-06-22 11:31:54 +01:00
David Baker
a6d9c25b70
Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands 
refactor, consolidate and improve SlashCommands
 2018-06-20 13:56:29 +01:00
David Baker
e67dae704a Take replies out of labs! 2018-06-20 09:57:11 +01:00
Michael Telatynski
85ddc0651b
consolidate the two locations commands are defined, as it was a MESS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 19:34:40 +01:00
Luke Barnard
bea52eccf8 Remove unused import, constant 2018-06-18 17:40:48 +01:00
Michael Telatynski
e0d36b18c9
make RoomTile context menu appear where you right clicked instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 12:08:47 +01:00
Michael Telatynski
1a236499b1
fix import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 11:54:06 +01:00
Michael Telatynski
4fdb64a049
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:10:13 +01:00
Michael Telatynski
8fa96e19d5
allow rightclicking for exposing room tile context menus 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:07:16 +01:00
Michael Telatynski
df15841483
split too long line 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 19:28:23 +01:00
Michael Telatynski
b97aa77aca
factor out warn self demote and apply to muting yourself 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 19:27:23 +01:00
David Baker
8cf17a66e5 Very basic Jitsi integration 
Replaces the conference calling by adding a Jitsi widget. No support
for continuing the call on room change currently, so hidden behind
a feature flag. Existing behaviour is preserved by default.
 2018-06-15 15:12:32 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group 
Share Dialog
 2018-06-15 10:52:27 +01:00
Luke Barnard
e81edd958b
Merge pull request #1950 from matrix-org/t3chguy/group_invite_contextmenu 
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
 2018-06-14 17:32:24 +01:00
Michael Telatynski
3b141d7a84
change variable names for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 16:48:00 +01:00
Michael Telatynski
1346f47a12
allow filtering Group Invite Tiles with the same search filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 14:18:39 +01:00
Michael Telatynski
7d7a6f3d9c
ShareDialog share Message, link to timestamp and permalink in ctx menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:35:35 +01:00
David Baker
666d469222
Revert "Fix exception when opening dev tools" 2018-06-14 10:52:39 +01:00
David Baker
5804040a9b
Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock 
fix message appears unencrypted while encrypting and not_sent
 2018-06-14 10:49:14 +01:00