mirror of
https://github.com/element-hq/element-web
synced 2024-11-24 10:15:43 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
Weblate
commit
3d17bd63a2
5 changed files with 108 additions and 11 deletions
80
CHANGELOG.md
80
CHANGELOG.md
|
|
@ -1,3 +1,83 @@
|
|||
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)
|
||||
===============================================================================================================
|
||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.2...v0.12.4-rc.3)
|
||||
|
||||
* Instant Sticker Picker :zap:
|
||||
[\#1888](https://github.com/matrix-org/matrix-react-sdk/pull/1888)
|
||||
|
||||
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)
|
||||
===============================================================================================================
|
||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.1...v0.12.4-rc.2)
|
||||
|
||||
* Improve appearance of short-lived widget loading spinner
|
||||
* Make sticker picker fully-fledged feature
|
||||
* Fix incorrect positioning with widget loading indicator
|
||||
|
||||
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)
|
||||
===============================================================================================================
|
||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.3...v0.12.4-rc.1)
|
||||
|
||||
* Update from Weblate.
|
||||
[\#1881](https://github.com/matrix-org/matrix-react-sdk/pull/1881)
|
||||
* Pin lolex at 2.3.2 to avoid bug causing tests to fail
|
||||
[\#1880](https://github.com/matrix-org/matrix-react-sdk/pull/1880)
|
||||
* Replies: un-break click-to-mention on SenderProfile for reply&preview
|
||||
[\#1878](https://github.com/matrix-org/matrix-react-sdk/pull/1878)
|
||||
* Add tests for RoomList
|
||||
[\#1877](https://github.com/matrix-org/matrix-react-sdk/pull/1877)
|
||||
* Fix crash when browser doesn't report page change measurement
|
||||
[\#1874](https://github.com/matrix-org/matrix-react-sdk/pull/1874)
|
||||
* fix thinko when changing from ClientPeg to context in static method (DUH)
|
||||
[\#1875](https://github.com/matrix-org/matrix-react-sdk/pull/1875)
|
||||
* Fix Replies :D
|
||||
[\#1873](https://github.com/matrix-org/matrix-react-sdk/pull/1873)
|
||||
* Update eslint-plugin-react
|
||||
[\#1871](https://github.com/matrix-org/matrix-react-sdk/pull/1871)
|
||||
* relax lint for jsx-curly-spacing and arrow-parens
|
||||
[\#1872](https://github.com/matrix-org/matrix-react-sdk/pull/1872)
|
||||
* Use develop js-sdk in jenkins build
|
||||
[\#1870](https://github.com/matrix-org/matrix-react-sdk/pull/1870)
|
||||
* Replies
|
||||
[\#1741](https://github.com/matrix-org/matrix-react-sdk/pull/1741)
|
||||
* Use the right js-sdk branch when testing
|
||||
[\#1869](https://github.com/matrix-org/matrix-react-sdk/pull/1869)
|
||||
* Prevent error responses wedging group request concurrency limit
|
||||
[\#1867](https://github.com/matrix-org/matrix-react-sdk/pull/1867)
|
||||
* Refresh group rooms and members when selecting a tag
|
||||
[\#1868](https://github.com/matrix-org/matrix-react-sdk/pull/1868)
|
||||
* Refactor GroupStores into one global GroupStore
|
||||
[\#1866](https://github.com/matrix-org/matrix-react-sdk/pull/1866)
|
||||
* Switch back to using blob URLs for rendering e2e attachments
|
||||
[\#1864](https://github.com/matrix-org/matrix-react-sdk/pull/1864)
|
||||
* Hide inline encryption icons except when hovering over a message
|
||||
[\#1845](https://github.com/matrix-org/matrix-react-sdk/pull/1845)
|
||||
* UI fixes in SessionRestoreErrorDialog
|
||||
[\#1860](https://github.com/matrix-org/matrix-react-sdk/pull/1860)
|
||||
* Fix UX issues with bug report dialog
|
||||
[\#1863](https://github.com/matrix-org/matrix-react-sdk/pull/1863)
|
||||
* fix ugly img errors and correctly render SVG thumbnails
|
||||
[\#1865](https://github.com/matrix-org/matrix-react-sdk/pull/1865)
|
||||
* Fix error handling on session restore
|
||||
[\#1859](https://github.com/matrix-org/matrix-react-sdk/pull/1859)
|
||||
* Add tests for GroupView
|
||||
[\#1862](https://github.com/matrix-org/matrix-react-sdk/pull/1862)
|
||||
* Update version of hoek
|
||||
[\#1861](https://github.com/matrix-org/matrix-react-sdk/pull/1861)
|
||||
* Fix bug that caused crash when analytics HS/IS whitelists not specified
|
||||
[\#1858](https://github.com/matrix-org/matrix-react-sdk/pull/1858)
|
||||
* Fix Analytics to not import DEFAULTS, therefore avoiding NPE
|
||||
[\#1857](https://github.com/matrix-org/matrix-react-sdk/pull/1857)
|
||||
* Null check piwik config before using it
|
||||
[\#1856](https://github.com/matrix-org/matrix-react-sdk/pull/1856)
|
||||
* Track actual window location origin and hash
|
||||
[\#1853](https://github.com/matrix-org/matrix-react-sdk/pull/1853)
|
||||
* Replace document.origin with window.location.origin
|
||||
[\#1855](https://github.com/matrix-org/matrix-react-sdk/pull/1855)
|
||||
* Optionally hide widget popout button.
|
||||
[\#1854](https://github.com/matrix-org/matrix-react-sdk/pull/1854)
|
||||
* Add a button to 'pop out' widgets in to their own tab.
|
||||
[\#1851](https://github.com/matrix-org/matrix-react-sdk/pull/1851)
|
||||
|
||||
Changes in [0.12.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.3) (2018-04-30)
|
||||
=====================================================================================================
|
||||
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.3-rc.3...v0.12.3)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "matrix-react-sdk",
|
||||
"version": "0.12.3",
|
||||
"version": "0.12.4-rc.3",
|
||||
"description": "SDK for matrix.org using React",
|
||||
"author": "matrix.org",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -364,9 +364,7 @@ export default class AppTile extends React.Component {
|
|||
if (!this.widgetMessaging) {
|
||||
this._onInitialLoad();
|
||||
}
|
||||
if (this._exposeWidgetMessaging) {
|
||||
this._exposeWidgetMessaging(this.widgetMessaging);
|
||||
}
|
||||
this.setState({loading: false});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -404,8 +402,6 @@ export default class AppTile extends React.Component {
|
|||
}).catch((err) => {
|
||||
console.log(`Failed to get capabilities for widget type ${this.props.type}`, this.props.id, err);
|
||||
});
|
||||
|
||||
this.setState({loading: false});
|
||||
}
|
||||
|
||||
_onWidgetAction(payload) {
|
||||
|
|
|
|||
|
|
@ -107,6 +107,16 @@ export default class MStickerBody extends MImageBody {
|
|||
placeholderFixupHeight = content.info.h + 'px';
|
||||
}
|
||||
|
||||
// The pixel size of sticker images is generally larger than their intended display
|
||||
// size so they render at native reolution on HiDPI displays. We therefore need to
|
||||
// explicity set the size so they render at the intended size.
|
||||
// XXX: This will be clobberred when we run fixupHeight(), but we need to do it
|
||||
// here otherwise the stickers are momentarily displayed at the pixel size.
|
||||
const imageStyle = {
|
||||
height: content.info.h,
|
||||
// leave the browser the calculate the width automatically
|
||||
};
|
||||
|
||||
placeholderSize = placeholderSize + 'px';
|
||||
|
||||
// Body 'ref' required by MImageBody
|
||||
|
|
@ -132,6 +142,7 @@ export default class MStickerBody extends MImageBody {
|
|||
<img
|
||||
className={'mx_MStickerBody_image ' + this.state.imageClasses}
|
||||
src={contentUrl}
|
||||
style={imageStyle}
|
||||
ref='image'
|
||||
alt={content.body}
|
||||
onLoad={this._onImageLoad}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ export default class Stickerpicker extends React.Component {
|
|||
this._onHideStickersClick = this._onHideStickersClick.bind(this);
|
||||
this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
|
||||
this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
|
||||
this._updateWidget = this._updateWidget.bind(this);
|
||||
this._onWidgetAction = this._onWidgetAction.bind(this);
|
||||
this._onResize = this._onResize.bind(this);
|
||||
this._onFinished = this._onFinished.bind(this);
|
||||
|
|
@ -90,11 +91,12 @@ export default class Stickerpicker extends React.Component {
|
|||
if (!this.state.imError) {
|
||||
this.dispatcherRef = dis.register(this._onWidgetAction);
|
||||
}
|
||||
const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
|
||||
this.setState({
|
||||
stickerpickerWidget,
|
||||
widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
|
||||
});
|
||||
|
||||
// Track updates to widget state in account data
|
||||
MatrixClientPeg.get().on('accountData', this._updateWidget);
|
||||
|
||||
// Initialise widget state from current account data
|
||||
this._updateWidget();
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
|
|
@ -116,6 +118,14 @@ export default class Stickerpicker extends React.Component {
|
|||
});
|
||||
}
|
||||
|
||||
_updateWidget() {
|
||||
const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
|
||||
this.setState({
|
||||
stickerpickerWidget,
|
||||
widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
|
||||
});
|
||||
}
|
||||
|
||||
_onWidgetAction(payload) {
|
||||
if (payload.action === "user_widget_updated") {
|
||||
this.forceUpdate();
|
||||
|
|
|
|||
Loading…
Reference in a new issue