Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 3d17bd6

Browse files
author
Weblate
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 5a6d80b + 49a3770 commit 3d17bd6

File tree

5 files changed

+108
-11
lines changed

5 files changed

+108
-11
lines changed

‎CHANGELOG.md‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,83 @@
1+
Changes in [0.12.4-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.4-rc.3) (2018-05-11)
2+
===============================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.2...v0.12.4-rc.3)
4+
5+
* Instant Sticker Picker :zap:
6+
[\#1888](https://github.com/matrix-org/matrix-react-sdk/pull/1888)
7+
8+
Changes in [0.12.4-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.4-rc.2) (2018-05-09)
9+
===============================================================================================================
10+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.1...v0.12.4-rc.2)
11+
12+
* Improve appearance of short-lived widget loading spinner
13+
* Make sticker picker fully-fledged feature
14+
* Fix incorrect positioning with widget loading indicator
15+
16+
Changes in [0.12.4-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.4-rc.1) (2018-05-09)
17+
===============================================================================================================
18+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.3...v0.12.4-rc.1)
19+
20+
* Update from Weblate.
21+
[\#1881](https://github.com/matrix-org/matrix-react-sdk/pull/1881)
22+
* Pin lolex at 2.3.2 to avoid bug causing tests to fail
23+
[\#1880](https://github.com/matrix-org/matrix-react-sdk/pull/1880)
24+
* Replies: un-break click-to-mention on SenderProfile for reply&preview
25+
[\#1878](https://github.com/matrix-org/matrix-react-sdk/pull/1878)
26+
* Add tests for RoomList
27+
[\#1877](https://github.com/matrix-org/matrix-react-sdk/pull/1877)
28+
* Fix crash when browser doesn't report page change measurement
29+
[\#1874](https://github.com/matrix-org/matrix-react-sdk/pull/1874)
30+
* fix thinko when changing from ClientPeg to context in static method (DUH)
31+
[\#1875](https://github.com/matrix-org/matrix-react-sdk/pull/1875)
32+
* Fix Replies :D
33+
[\#1873](https://github.com/matrix-org/matrix-react-sdk/pull/1873)
34+
* Update eslint-plugin-react
35+
[\#1871](https://github.com/matrix-org/matrix-react-sdk/pull/1871)
36+
* relax lint for jsx-curly-spacing and arrow-parens
37+
[\#1872](https://github.com/matrix-org/matrix-react-sdk/pull/1872)
38+
* Use develop js-sdk in jenkins build
39+
[\#1870](https://github.com/matrix-org/matrix-react-sdk/pull/1870)
40+
* Replies
41+
[\#1741](https://github.com/matrix-org/matrix-react-sdk/pull/1741)
42+
* Use the right js-sdk branch when testing
43+
[\#1869](https://github.com/matrix-org/matrix-react-sdk/pull/1869)
44+
* Prevent error responses wedging group request concurrency limit
45+
[\#1867](https://github.com/matrix-org/matrix-react-sdk/pull/1867)
46+
* Refresh group rooms and members when selecting a tag
47+
[\#1868](https://github.com/matrix-org/matrix-react-sdk/pull/1868)
48+
* Refactor GroupStores into one global GroupStore
49+
[\#1866](https://github.com/matrix-org/matrix-react-sdk/pull/1866)
50+
* Switch back to using blob URLs for rendering e2e attachments
51+
[\#1864](https://github.com/matrix-org/matrix-react-sdk/pull/1864)
52+
* Hide inline encryption icons except when hovering over a message
53+
[\#1845](https://github.com/matrix-org/matrix-react-sdk/pull/1845)
54+
* UI fixes in SessionRestoreErrorDialog
55+
[\#1860](https://github.com/matrix-org/matrix-react-sdk/pull/1860)
56+
* Fix UX issues with bug report dialog
57+
[\#1863](https://github.com/matrix-org/matrix-react-sdk/pull/1863)
58+
* fix ugly img errors and correctly render SVG thumbnails
59+
[\#1865](https://github.com/matrix-org/matrix-react-sdk/pull/1865)
60+
* Fix error handling on session restore
61+
[\#1859](https://github.com/matrix-org/matrix-react-sdk/pull/1859)
62+
* Add tests for GroupView
63+
[\#1862](https://github.com/matrix-org/matrix-react-sdk/pull/1862)
64+
* Update version of hoek
65+
[\#1861](https://github.com/matrix-org/matrix-react-sdk/pull/1861)
66+
* Fix bug that caused crash when analytics HS/IS whitelists not specified
67+
[\#1858](https://github.com/matrix-org/matrix-react-sdk/pull/1858)
68+
* Fix Analytics to not import DEFAULTS, therefore avoiding NPE
69+
[\#1857](https://github.com/matrix-org/matrix-react-sdk/pull/1857)
70+
* Null check piwik config before using it
71+
[\#1856](https://github.com/matrix-org/matrix-react-sdk/pull/1856)
72+
* Track actual window location origin and hash
73+
[\#1853](https://github.com/matrix-org/matrix-react-sdk/pull/1853)
74+
* Replace document.origin with window.location.origin
75+
[\#1855](https://github.com/matrix-org/matrix-react-sdk/pull/1855)
76+
* Optionally hide widget popout button.
77+
[\#1854](https://github.com/matrix-org/matrix-react-sdk/pull/1854)
78+
* Add a button to 'pop out' widgets in to their own tab.
79+
[\#1851](https://github.com/matrix-org/matrix-react-sdk/pull/1851)
80+
181
Changes in [0.12.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.3) (2018-04-30)
282
=====================================================================================================
383
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.3-rc.3...v0.12.3)

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "0.12.3",
3+
"version": "0.12.4-rc.3",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {

‎src/components/views/elements/AppTile.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,7 @@ export default class AppTile extends React.Component {
364364
if (!this.widgetMessaging) {
365365
this._onInitialLoad();
366366
}
367-
if (this._exposeWidgetMessaging) {
368-
this._exposeWidgetMessaging(this.widgetMessaging);
369-
}
367+
this.setState({loading: false});
370368
}
371369

372370
/**
@@ -404,8 +402,6 @@ export default class AppTile extends React.Component {
404402
}).catch((err) => {
405403
console.log(`Failed to get capabilities for widget type ${this.props.type}`, this.props.id, err);
406404
});
407-
408-
this.setState({loading: false});
409405
}
410406

411407
_onWidgetAction(payload) {

‎src/components/views/messages/MStickerBody.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,16 @@ export default class MStickerBody extends MImageBody {
107107
placeholderFixupHeight = content.info.h + 'px';
108108
}
109109

110+
// The pixel size of sticker images is generally larger than their intended display
111+
// size so they render at native reolution on HiDPI displays. We therefore need to
112+
// explicity set the size so they render at the intended size.
113+
// XXX: This will be clobberred when we run fixupHeight(), but we need to do it
114+
// here otherwise the stickers are momentarily displayed at the pixel size.
115+
const imageStyle = {
116+
height: content.info.h,
117+
// leave the browser the calculate the width automatically
118+
};
119+
110120
placeholderSize = placeholderSize + 'px';
111121

112122
// Body 'ref' required by MImageBody
@@ -132,6 +142,7 @@ export default class MStickerBody extends MImageBody {
132142
<img
133143
className={'mx_MStickerBody_image ' + this.state.imageClasses}
134144
src={contentUrl}
145+
style={imageStyle}
135146
ref='image'
136147
alt={content.body}
137148
onLoad={this._onImageLoad}

‎src/components/views/rooms/Stickerpicker.js‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export default class Stickerpicker extends React.Component {
3434
this._onHideStickersClick = this._onHideStickersClick.bind(this);
3535
this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
3636
this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
37+
this._updateWidget = this._updateWidget.bind(this);
3738
this._onWidgetAction = this._onWidgetAction.bind(this);
3839
this._onResize = this._onResize.bind(this);
3940
this._onFinished = this._onFinished.bind(this);
@@ -90,11 +91,12 @@ export default class Stickerpicker extends React.Component {
9091
if (!this.state.imError) {
9192
this.dispatcherRef = dis.register(this._onWidgetAction);
9293
}
93-
const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
94-
this.setState({
95-
stickerpickerWidget,
96-
widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
97-
});
94+
95+
// Track updates to widget state in account data
96+
MatrixClientPeg.get().on('accountData', this._updateWidget);
97+
98+
// Initialise widget state from current account data
99+
this._updateWidget();
98100
}
99101

100102
componentWillUnmount() {
@@ -116,6 +118,14 @@ export default class Stickerpicker extends React.Component {
116118
});
117119
}
118120

121+
_updateWidget() {
122+
const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
123+
this.setState({
124+
stickerpickerWidget,
125+
widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
126+
});
127+
}
128+
119129
_onWidgetAction(payload) {
120130
if (payload.action === "user_widget_updated") {
121131
this.forceUpdate();

0 commit comments

Comments
 (0)