michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into custom-emoji-viewer

Browse source
This commit is contained in:
Ajay Bura 2022-08-05 19:24:39 +05:30 committed by GitHub
commit 1ac790647b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app/molecules/message/Message.jsx
View file

@ -161,8 +161,8 @@ const MessageReplyWrapper = React.memo(({ roomTimeline, eventId }) => {
}, []); }, []);
const focusReply = (ev) => { const focusReply = (ev) => {
if (!ev.keyCode || ev.keyCode === 32 || ev.keyCode === 13) { if (!ev.key || ev.key === ' ' || ev.key === 'Enter') {
if (ev.keyCode) ev.preventDefault(); if (ev.key) ev.preventDefault();
if (reply?.event === null) return; if (reply?.event === null) return;
if (reply?.event.isRedacted()) return; if (reply?.event.isRedacted()) return;
roomTimeline.loadEventTimeline(eventId); roomTimeline.loadEventTimeline(eventId);
@ -276,7 +276,7 @@ function MessageEdit({ body, onSave, onCancel }) {
}, []); }, []);
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.keyCode === 13 && e.shiftKey === false) { if (e.key === 'Enter' && e.shiftKey === false) {
e.preventDefault(); e.preventDefault();
onSave(editInputRef.current.value); onSave(editInputRef.current.value);
} }

4
src/app/organisms/room/RoomViewCmdBar.jsx
View file

@ -262,11 +262,11 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
function listenKeyboard(event) { function listenKeyboard(event) {
const { activeElement } = document; const { activeElement } = document;
const lastCmdItem = document.activeElement.parentNode.lastElementChild; const lastCmdItem = document.activeElement.parentNode.lastElementChild;
if (event.keyCode === 27) { if (event.key === 'Escape') {
if (activeElement.className !== 'cmd-item') return; if (activeElement.className !== 'cmd-item') return;
viewEvent.emit('focus_msg_input'); viewEvent.emit('focus_msg_input');
} }
if (event.keyCode === 9) { if (event.key === 'Tab') {
if (lastCmdItem.className !== 'cmd-item') return; if (lastCmdItem.className !== 'cmd-item') return;
if (lastCmdItem !== activeElement) return; if (lastCmdItem !== activeElement) return;
if (event.shiftKey) return; if (event.shiftKey) return;

2
src/app/organisms/room/RoomViewInput.jsx
View file

@ -286,7 +286,7 @@ function RoomViewInput({
}; };
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.keyCode === 13 && e.shiftKey === false) { if (e.key === 'Enter' && e.shiftKey === false) {
e.preventDefault(); e.preventDefault();
sendMessage(); sendMessage();
} }

6
src/client/event/hotkeys.js
View file

@ -31,14 +31,14 @@ function listenKeyboard(event) {
// Ctrl/Cmd + // Ctrl/Cmd +
if (event.ctrlKey || event.metaKey) { if (event.ctrlKey || event.metaKey) {
// open search modal // open search modal
if (event.code === 'KeyK') { if (event.key === 'k') {
event.preventDefault(); event.preventDefault();
if (navigation.isRawModalVisible) return; if (navigation.isRawModalVisible) return;
openSearch(); openSearch();
} }
// focus message field on paste // focus message field on paste
if (event.code === 'KeyV') { if (event.key === 'v') {
if (navigation.isRawModalVisible) return; if (navigation.isRawModalVisible) return;
const msgTextarea = document.getElementById('message-textarea'); const msgTextarea = document.getElementById('message-textarea');
const { activeElement } = document; const { activeElement } = document;
@ -52,7 +52,7 @@ function listenKeyboard(event) {
if (!event.ctrlKey && !event.altKey && !event.metaKey) { if (!event.ctrlKey && !event.altKey && !event.metaKey) {
if (navigation.isRawModalVisible) return; if (navigation.isRawModalVisible) return;
if (event.code === 'Escape') { if (event.key === 'Escape') {
if (navigation.isRoomSettings) { if (navigation.isRoomSettings) {
toggleRoomSettings(); toggleRoomSettings();
return; return;