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
5077e9e89b
Merge pull request #1958 from matrix-org/dbkr/widget_waiting
...
Fix widgets re-appearing after being deleted
2018-06-14 17:31:23 +01:00
3b141d7a84
change variable names for clarity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 16:48:00 +01:00
a3bc68c562
Merge pull request #1967 from matrix-org/luke/fix-crash-on-unspecified-thumbnail-info
...
Fix crash on unspecified thumbnail info, and handle gracefully
2018-06-14 16:10:35 +01:00
2eb23ed234
Add loadedImageDimensions to initial state
2018-06-14 15:53:49 +01:00
2d14d51ecb
Handle images without width/height info correctly
...
Prior to #1912 , height fix up of image events without an `info` in their
content would fail, setting `style.height = null + "px"`.
Now that all thumbnail sizing is done through one path, we can fix the
same problem for all cases (images, stickers, e2e/non-e2e) by handling
images without `info` correctly.
At the bare minimum, we use a null-guard that will make sure an image
without an `info` does not appear in the timeline (as a spinner or
otherwise until loaded). When loaded, we size it like any other image
by using the natural dimensions of the loaded image in place of `info`.
Note that we do not apply the same logic to images that *do* specify an
`info` with `w` and `h` keys. If the aspect ratio of the image does not
match that of the event, we use the one in `info` even when the image
has loaded.
2018-06-14 15:44:55 +01:00
c8d233c0a6
If unspecified, don't crash if missing thumbnail info
...
applies to stickers/images.
We might want to consider to do that is better than assuming a aspect
ratio of 600 x 800 (4:3).
2018-06-14 14:19:30 +01:00
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
4e216714b5
remove commented code and move modal.close into a finally block
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:53:02 +01:00
3e6b3215cf
Update WidgetUtils.js
...
Fix fixed comment
2018-06-14 13:49:23 +01:00
36574ca0fb
Fix doc
2018-06-14 13:03:42 +01:00
5523c1e50a
Merge pull request #1964 from matrix-org/t3chguy/tag_panel_a11y
...
fix styling of clearButton when its not there
2018-06-14 11:47:44 +01:00
3b501137a5
change cursor:pointer iff clicking TagPanel background does something
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:42:21 +01:00
c811c30c0d
fix styling of clearButton when its not there
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:36:04 +01:00
7029e9ac74
Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight
...
Implement slightly magical CSS soln. to thumbnail sizing
2018-06-14 11:17:15 +01:00
3165a99f52
Merge pull request #1932 from matrix-org/t3chguy/audio_output
...
Select audio output for WebRTC
2018-06-14 11:11:53 +01:00
2454540bc0
Merge branch 'develop' into t3chguy/audio_output
2018-06-14 11:03:59 +01:00
742a2d0111
Merge pull request #1962 from matrix-org/t3chguy/codeblock_notice
...
move css rule to be more generic; remove overriden rule
2018-06-14 10:57:58 +01:00
84a9c6a824
Merge pull request #1960 from matrix-org/t3chguy/tag_panel_a11y
...
improve tag panel accessibility and remove a no-op dispatch
2018-06-14 10:56:03 +01:00
2e53baaaff
Merge pull request #1963 from matrix-org/revert-1961-dbkr/fix_devtools_exception
...
Revert "Fix exception when opening dev tools"
2018-06-14 10:52:53 +01:00
666d469222
Revert "Fix exception when opening dev tools"
2018-06-14 10:52:39 +01:00
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
bb99950216
Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception
...
Fix exception when opening dev tools
2018-06-14 09:45:19 +01:00
a257dc27c5
move css rule to be more generic; remove overriden rule
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 19:08:24 +01:00
038b43aabd
Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker
...
show redacted stickers like other redacted messages
2018-06-13 17:28:22 +01:00
b81e12e4cc
Fix exception when opening dev tools
...
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.
This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.
Fixes https://github.com/vector-im/riot-web/issues/6436
2018-06-13 16:55:16 +01:00
75abb415d4
improve tag panel accessibility and remove a no-op dispatch
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 16:17:26 +01:00
ac77b2d9ec
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 16:00:57 +01:00
5cc2361737
change not_sent e2e lock to match colour of text
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 15:52:50 +01:00
94125fb566
Fix widgets re-appearing after being deleted
...
Widgets would sometimes briefly re-appear after having been deleted.
This was because of the following race:
* User presses delete, send POST req, we set `deleting`. Widget hides.
* POST request completes, we unset `deleting` so widget unhides.
* State event comes down sync so widget hides again.
This fixes this by introducing `waitForRoomWidget` and using it to
wait until the state event comes down the sync until clearing the
`deleting` flag.
Since we now have `waitForRoomWidget`, this also uses it when adding
a widget so the 'widget saved' appears at the same time the widget
does.
2018-06-13 15:50:19 +01:00
d4b2f06a63
fix message appears unencrypted while in flight
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 13:51:04 +01:00
1cb794753e
Simplify & refactor some widget stuff
...
* ScalarMessaging onMessage was getting the current room ID by listening
for view_and remembering the room id or alias, and so having to look up
the alias if it was alias. We have RoomViewStore for this.
* Move waitForUserWidget into WidgetUtils
* s/require/import/
2018-06-13 10:39:52 +01:00
bfb535d05c
Merge pull request #1951 from matrix-org/t3chguy/theme_memberinfo_close_btn
...
add mx_filterFlipColor to mx_MemberInfo_cancel img
2018-06-13 10:04:23 +01:00
5a275fcfef
Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname
...
don't set the displayname on registration as Synapse now does it
2018-06-13 10:03:35 +01:00
791784399a
Merge pull request #1955 from matrix-org/t3chguy/create_room_dialog_scaling
...
allow CreateRoom to scale properly horizontally
2018-06-13 09:45:29 +01:00
20caea47f8
make more generic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:32:21 +01:00
846c14062a
show redacted stickers like other redacted messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:28:35 +01:00
22bec0d67d
allow CreateRoom to scale properly horizontally
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:13:32 +01:00
175f1aa15c
don't set the displayname on registration as Synapse now does it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 16:43:54 +01:00
b18a8c483e
Merge pull request #1952 from matrix-org/luke/context-menus-downwards-keep-vertically-on-screen
...
Keep context menus that extend downwards vertically on screen
2018-06-12 16:27:57 +01:00
ffcba9498e
Keep context menus that extend downwards vertically on screen
...
This fixes https://github.com/vector-im/riot-web/issues/3429 in the case
of RoomList context menus *and* EventTile context menus.
This was mostly stolen from #1903 and it would be good to factor things
out at a later date such that #1903 is replaced with similar logic
within ContextualMenu.
2018-06-12 16:14:24 +01:00
ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:35:06 +01:00
9dd2184b33
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:29:05 +01:00
c820836bcc
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:23:11 +01:00
e858cf3bcb
Merge branch 'master' into develop
2018-06-12 14:26:29 +01:00
13d52065f5
Merge branch 'release-v0.12.7'
2018-06-12 14:23:48 +01:00
ef1f580abb
v0.12.7
2018-06-12 14:21:30 +01:00
0ad738d510
Prepare changelog for v0.12.7
2018-06-12 14:21:30 +01:00
334dccbdc7
Released js-sdk
2018-06-12 14:14:14 +01:00
2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight
2018-06-11 14:24:40 +01:00
Luke Barnard