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

remove unnessary manual focussing of composer 

now that composer is focused automatically when no other shortcuts
apply, remove the manual focusing we have in place where it's not needed
pull/21833/head
Bruno Windels 2019-07-15 18:21:10 +02:00
parent 4adea67eb3
commit 57abbc4273
5 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ContentMessages.js
View File

@ -498,9 +498,6 @@ export default class ContentMessages {
this.inprogress.push(upload); this.inprogress.push(upload);
dis.dispatch({action: 'upload_started'}); dis.dispatch({action: 'upload_started'});
// Focus the composer view
dis.dispatch({action: 'focus_composer'});
let error; let error;
function onProgress(ev) { function onProgress(ev) {

9
src/components/structures/MatrixChat.js
View File

@ -268,8 +268,6 @@ export default React.createClass({
componentDidMount: function() { componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction); this.dispatcherRef = dis.register(this.onAction);
this.focusComposer = false;
// this can technically be done anywhere but doing this here keeps all // this can technically be done anywhere but doing this here keeps all
// the routing url path logic together. // the routing url path logic together.
if (this.onAliasClick) { if (this.onAliasClick) {
@ -362,10 +360,6 @@ export default React.createClass({
const durationMs = this.stopPageChangeTimer(); const durationMs = this.stopPageChangeTimer();
Analytics.trackPageChange(durationMs); Analytics.trackPageChange(durationMs);
} }
if (this.focusComposer) {
dis.dispatch({action: 'focus_composer'});
this.focusComposer = false;
}
}, },
startPageChangeTimer() { startPageChangeTimer() {
@ -793,8 +787,6 @@ export default React.createClass({
// that has been passed out-of-band (eg. // that has been passed out-of-band (eg.
// room name and avatar from an invite email) // room name and avatar from an invite email)
_viewRoom: function(roomInfo) { _viewRoom: function(roomInfo) {
this.focusComposer = true;
const newState = { const newState = {
view: VIEWS.LOGGED_IN, view: VIEWS.LOGGED_IN,
currentRoomId: roomInfo.room_id || null, currentRoomId: roomInfo.room_id || null,
@ -1368,7 +1360,6 @@ export default React.createClass({
self.firstSyncComplete = true; self.firstSyncComplete = true;
self.firstSyncPromise.resolve(); self.firstSyncPromise.resolve();
dis.dispatch({action: 'focus_composer'});
self.setState({ self.setState({
ready: true, ready: true,
showNotifierToolbar: Notifier.shouldShowToolbar(), showNotifierToolbar: Notifier.shouldShowToolbar(),

2
src/components/structures/RoomStatusBar.js
View File

@ -135,12 +135,10 @@ module.exports = React.createClass({
_onResendAllClick: function() { _onResendAllClick: function() {
Resend.resendUnsentEvents(this.props.room); Resend.resendUnsentEvents(this.props.room);
dis.dispatch({action: 'focus_composer'});
}, },
_onCancelAllClick: function() { _onCancelAllClick: function() {
Resend.cancelUnsentEvents(this.props.room); Resend.cancelUnsentEvents(this.props.room);
dis.dispatch({action: 'focus_composer'});
}, },
_onShowDevicesClick: function() { _onShowDevicesClick: function() {

3
src/components/views/elements/MessageEditor.js
View File

@ -222,7 +222,6 @@ export default class MessageEditor extends React.Component {
dis.dispatch({action: 'edit_event', event: nextEvent}); dis.dispatch({action: 'edit_event', event: nextEvent});
} else { } else {
dis.dispatch({action: 'edit_event', event: null}); dis.dispatch({action: 'edit_event', event: null});
dis.dispatch({action: 'focus_composer'});
} }
event.preventDefault(); event.preventDefault();
} }
@ -230,7 +229,6 @@ export default class MessageEditor extends React.Component {
_cancelEdit = () => { _cancelEdit = () => {
dis.dispatch({action: "edit_event", event: null}); dis.dispatch({action: "edit_event", event: null});
dis.dispatch({action: 'focus_composer'});
} }
_hasModifications(newContent) { _hasModifications(newContent) {
@ -257,7 +255,6 @@ export default class MessageEditor extends React.Component {
this.context.matrixClient.sendMessage(roomId, editContent); this.context.matrixClient.sendMessage(roomId, editContent);
dis.dispatch({action: "edit_event", event: null}); dis.dispatch({action: "edit_event", event: null});
dis.dispatch({action: 'focus_composer'});
} }
_cancelPreviousPendingEdit() { _cancelPreviousPendingEdit() {

5
src/cryptodevices.js
View File

@ -65,10 +65,6 @@ export async function getUnknownDevicesForRoom(matrixClient, room) {
return unknownDevices; return unknownDevices;
} }
function focusComposer() {
dis.dispatch({action: 'focus_composer'});
}
/** /**
* Show the UnknownDeviceDialog for a given room. The dialog will inform the user * Show the UnknownDeviceDialog for a given room. The dialog will inform the user
* that messages they sent to this room have not been sent due to unknown devices * that messages they sent to this room have not been sent due to unknown devices
@ -90,7 +86,6 @@ export function showUnknownDeviceDialogForMessages(matrixClient, room) {
sendAnywayLabel: _t("Send anyway"), sendAnywayLabel: _t("Send anyway"),
sendLabel: _t("Send"), sendLabel: _t("Send"),
onSend: onSendClicked, onSend: onSendClicked,
onFinished: focusComposer,
}, 'mx_Dialog_unknownDevice'); }, 'mx_Dialog_unknownDevice');
}); });
} }