33c8907267
Merge remote-tracking branch 'origin/develop' into develop
2017-09-12 09:52:22 +00:00
802f53dc24
Merge pull request #1378 from matrix-org/t3chguy/zh_Hans-1
...
fix some more zh_Hans - remove entirely broken lines
2017-09-12 10:52:08 +01:00
0b6d352cf4
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
...
Conflicts:
src/i18n/strings/de_DE.json
src/i18n/strings/fi.json
src/i18n/strings/hu.json
src/i18n/strings/nl.json
src/i18n/strings/pl.json
src/i18n/strings/ru.json
src/i18n/strings/zh_Hant.json
2017-09-12 09:33:58 +00:00
9920cd4f55
fix some more zh_Hans - remove entirely broken lines
2017-09-12 10:24:56 +01:00
0cdb9322e9
Translated using Weblate (Spanish)
...
Currently translated at 80.7% (785 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-09-12 09:10:07 +00:00
f124a9069b
Translated using Weblate (Polish)
...
Currently translated at 97.3% (946 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-12 09:10:07 +00:00
cf3118fb5e
Translated using Weblate (German)
...
Currently translated at 100.0% (972 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-09-12 09:10:07 +00:00
56125d6e38
Translated using Weblate (Finnish)
...
Currently translated at 9.4% (92 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-09-12 09:10:07 +00:00
e3b70a76a4
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (972 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-09-12 09:10:06 +00:00
aa4bad5b67
Translated using Weblate (Czech)
...
Currently translated at 35.0% (341 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-09-12 09:10:06 +00:00
7ab7461a37
Translated using Weblate (Catalan)
...
Currently translated at 6.7% (66 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2017-09-12 09:10:06 +00:00
7425f9b066
Merge pull request #1377 from matrix-org/t3chguy/zh_Hans
...
fix placeholder causing app to break when using zh
2017-09-12 10:09:31 +01:00
aa82be1fb1
Merge branch 'develop' into rob/electron-screensharing
2017-09-12 10:54:20 +02:00
92ae0db1bd
fix placeholder causing app to break when using zh
2017-09-12 09:35:47 +01:00
3c70b86668
Merge pull request #1375 from matrix-org/dbkr/active_room_observer
...
Avoid re-rendering RoomList on room switch
2017-09-11 18:52:09 +01:00
7e1886c2ab
Merge pull request #1376 from matrix-org/dbkr/fix_failed_to_load_timeline_pos
...
Fix 'Failed to load timeline position' regression
2017-09-11 18:51:41 +01:00
6cb98d7196
Hopefully make comment clearer
2017-09-11 18:39:30 +01:00
531fc3ac54
Fix 'Failed to load timeline position' regression
...
Ignore the update that comes in from the RoomViewStore when the
current room changes or we save our scoll state against the new
room rather than the old one.
Fixes https://github.com/vector-im/riot-web/issues/5010
2017-09-11 17:57:52 +01:00
be8f0991a6
Avoid re-rendering RoomList on room switch
...
Introduce a class that consumes updates from the RoomViewStore and
announces to listeners if the active room ID is now or is no longer
the room ID they specified. Naming suggestions welcome: it's
currently called ActiveRoomObserver.
Avoids passing the selectedRoomId down from MatrixChat all the way
through the LeftPanel / RoomList / RoomSubList to the RoomTiles.
Also introduce a CallPreview class that listens directly for
RoomViewStore changes as the call preview in the left panel needs
to know when the room changes, so this allows this component to
update without having to update the entire left panel.
2017-09-11 16:59:09 +01:00
188c7df53a
Translated using Weblate (Polish)
...
Currently translated at 93.6% (910 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-11 13:03:11 +00:00
610e53889e
Translated using Weblate (Polish)
...
Currently translated at 93.5% (909 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-11 12:48:46 +00:00
0580d536ad
Merge branch 'develop' into t3chguy/on_copy_tooltip
2017-09-10 18:54:52 +01:00
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
cc6123b556
Merge pull request #1374 from matrix-org/dbkr/consolidate_code_copy_button
...
Consolidate the code copy button
2017-09-10 16:07:51 +01:00
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
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
e1aefd2119
Merge pull request #1373 from matrix-org/dbkr/code_copy_only_html
...
Only add the code copy button for HTML messages
2017-09-09 05:31:05 +01:00
fe79010e4e
Only add the code copy button for HTML messages
...
Trivial fast-path optimisation: plain text messages cannot possibly contain pre
blocks so there's no point in trying to parse them in order to add code copy
buttons.
2017-09-08 23:36:22 +01:00
ea5726aa4e
Copyright
2017-09-08 23:14:06 +01:00
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
1f84c68180
Merge pull request #1371 from matrix-org/dbkr/fix_extra_matrixchat_render
...
Don't re-render matrixchat unnecessarily
2017-09-08 19:27:09 +01:00
0e8bd856bc
remove obsolete this._roomViewStoreToken.remove();
2017-09-08 20:14:27 +02:00
663dc3e513
Don't re-render matrixchat unnecessarily
...
...on room switch. We were setting most of the state in viewRoom,
but getting the current room ID from the RoomViewStore, but this
meant we did one setState from the RoomViewStore updating,
re-rendered and then setState again in viewRoom causing another
render. This just sets the room ID in viewRoom.
2017-09-08 18:56:57 +01:00
d507dc7975
Merge pull request #1370 from matrix-org/dbkr/onhaveroom_no_wait_for_setstate
...
Don't wait for setState to run onHaveRoom
2017-09-08 18:24:57 +01:00
aee2f3cdef
Rename onHaveRoom
...
And move some code out of it which didn't really have any reason
to be hanging out there rather than just be where we set the room
a few lines above.
2017-09-08 18:11:13 +01:00
bf982004f6
Give onHaveRoom the info it needs explicitly
...
Rather than giving it a state object which is not actually the
whole state but happens to be everything it actually wants
(currently)
2017-09-08 17:56:53 +01:00
81871c50be
Add more doc
...
on why module level variables do not work as singletons
2017-09-08 17:43:41 +01:00
cce772c087
Merge remote-tracking branch 'origin/develop' into dbkr/onhaveroom_no_wait_for_setstate
2017-09-08 17:41:18 +01:00
03dcded72f
Blank line to make comment clearer
2017-09-08 17:39:10 +01:00
a012dbafce
Merge pull request #1367 from matrix-org/dbkr/scroll_state_store
...
Introduce a RoomScrollStateStore
2017-09-08 17:37:32 +01:00
1be35a77ec
Don't wait for setState to run onHaveRoom
...
onHaveRoom sets some more state (among other things) so putting it
in the setState callback so it could observe the new state caused
us to have to re-render again unnecessarily. Just give it the new
state as a parameter.
2017-09-08 17:06:46 +01:00
984d639a37
Merge remote-tracking branch 'origin/develop' into dbkr/scroll_state_store
2017-09-08 15:58:38 +01:00
13b094a3f6
Merge pull request #1369 from matrix-org/dbkr/dont_always_paginate
...
Don't always paginate when mounting a ScrollPanel
2017-09-08 15:51:55 +01:00
d33f90e002
Translated using Weblate (Polish)
...
Currently translated at 80.1% (779 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-08 14:49:38 +00:00
78a2e49705
Don't always paginate when mounting a ScrollPanel
...
Calling just checkFill on DidMount did not initially set the
scrollTop which meant that one back pagination request is always
performed regardless. This meant we would end up rending the
first batch of events, then paginating and re-rendering again
after the pagination got another batch, causing unnecessary render
churn.
2017-09-08 15:41:19 +01:00
59c54d3756
Remove redundant code
2017-09-08 13:39:22 +01:00
d714291aa1
Re-add doc on scroll state map structure
2017-09-08 13:27:14 +01:00
5684074639
Translated using Weblate (Polish)
...
Currently translated at 77.3% (752 of 972 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-09-07 23:01:25 +00:00
3df379cb49
fix radio for theme selection
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-07 18:54:41 +01:00
82d1afcc47
Correct comment
2017-09-07 17:16:32 +01:00
Weblate