OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

move implementation to MessageComposer to it applies to any future composers 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2017-05-03 16:21:35 +01:00
parent daae3bd1ec
commit b6fd771b9a
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/views/rooms/MessageComposer.js
View File

@ -43,6 +43,7 @@ export default class MessageComposer extends React.Component {
this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
this.onInputStateChanged = this.onInputStateChanged.bind(this);
this.onEvent = this.onEvent.bind(this);
this.onPageUnload = this.onPageUnload.bind(this);
this.state = {
autocompleteQuery: '',
@ -64,12 +65,22 @@ export default class MessageComposer extends React.Component {
// marked as encrypted.
// XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
MatrixClientPeg.get().on("event", this.onEvent);
window.addEventListener('beforeunload', this.onPageUnload);
}
componentWillUnmount() {
if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener("event", this.onEvent);
}
window.removeEventListener('beforeunload', this.onPageUnload);
}
onPageUnload(event) {
if (this.messageComposerInput && this.messageComposerInput.isTyping) {
return event.returnValue =
'You seem to be typing a message, are you sure you want to quit?';
}
}
onEvent(event) {

10
src/components/views/rooms/MessageComposerInput.js
View File

@ -93,7 +93,6 @@ export default class MessageComposerInput extends React.Component {
this.onEscape = this.onEscape.bind(this);
this.setDisplayedCompletion = this.setDisplayedCompletion.bind(this);
this.onMarkdownToggleClicked = this.onMarkdownToggleClicked.bind(this);
this.onPageUnload = this.onPageUnload.bind(this);
const isRichtextEnabled = UserSettingsStore.getSyncedSetting('MessageComposerInput.isRichTextEnabled', false);
@ -234,13 +233,11 @@ export default class MessageComposerInput extends React.Component {
this.refs.editor,
this.props.room.roomId
);
window.addEventListener('beforeunload', this.onPageUnload);
}
componentWillUnmount() {
dis.unregister(this.dispatcherRef);
this.sentHistory.saveLastTextEntry();
window.removeEventListener('beforeunload', this.onPageUnload);
}
componentWillUpdate(nextProps, nextState) {
@ -252,13 +249,6 @@ export default class MessageComposerInput extends React.Component {
}
}
onPageUnload(event) {
if (this.isTyping) {
return event.returnValue =
'You seem to be typing a message, are you sure you want to quit?';
}
}
onAction(payload) {
let editor = this.refs.editor;
let contentState = this.state.editorState.getCurrentContent();

9
src/components/views/rooms/MessageComposerInputOld.js
View File

@ -177,20 +177,11 @@ export default React.createClass({
if (this.props.tabComplete) {
this.props.tabComplete.setTextArea(this.refs.textarea);
}
window.addEventListener('beforeunload', this.onPageUnload);
},
componentWillUnmount: function() {
dis.unregister(this.dispatcherRef);
this.sentHistory.saveLastTextEntry();
window.removeEventListener('beforeunload', this.onPageUnload);
},
onPageUnload(event) {
if (this.isTyping) {
return event.returnValue =
'You seem to be typing a message, are you sure you want to quit?';
}
},
onAction: function(payload) {