mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branches 'develop' and 't3chguy/register_disable_no_custom_url_spinner' of github.com:matrix-org/matrix-react-sdk into t3chguy/register_disable_no_custom_url_spinner

Browse source
This commit is contained in:
Michael Telatynski 2019-09-19 10:07:42 +01:00
commit d1fb31a6dc
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/MatrixChat.js
View file

@ -286,7 +286,10 @@ export default createReactClass({
// the first thing to do is to try the token params in the query-string // the first thing to do is to try the token params in the query-string
// if the session isn't soft logged out (ie: is a clean session being logged in) // if the session isn't soft logged out (ie: is a clean session being logged in)
if (!Lifecycle.isSoftLogout()) { if (!Lifecycle.isSoftLogout()) {
Lifecycle.attemptTokenLogin(this.props.realQueryParams).then((loggedIn) => { Lifecycle.attemptTokenLogin(
this.props.realQueryParams,
this.props.defaultDeviceDisplayName,
).then((loggedIn) => {
if (loggedIn) { if (loggedIn) {
this.props.onTokenLoginCompleted(); this.props.onTokenLoginCompleted();

1
src/components/views/rooms/BasicMessageComposer.js
View file

@ -179,6 +179,7 @@ export default class BasicMessageEditor extends React.Component {
const {partCreator} = model; const {partCreator} = model;
const text = event.clipboardData.getData("text/plain"); const text = event.clipboardData.getData("text/plain");
if (text) { if (text) {
this._modifiedFlag = true;
const range = getRangeForSelection(this._editorRef, model, document.getSelection()); const range = getRangeForSelection(this._editorRef, model, document.getSelection());
const parts = parsePlainTextMessage(text, partCreator); const parts = parsePlainTextMessage(text, partCreator);
replaceRangeAndMoveCaret(range, parts); replaceRangeAndMoveCaret(range, parts);