summary refs log tree commit diff
path: root/resources/qml
diff options
context:
space:
mode:
authorRohit Sutradhar <rohitsutradhar311@gmail.com>2022-06-18 01:38:29 +0530
committerGitHub <noreply@github.com>2022-06-17 20:08:29 +0000
commitb0e3c6d65ab914934e66c46ae1a53388b22125c0 (patch)
tree7e43afbebe1fd14eb9a771663650e2155664e08a /resources/qml
parentGet rid of 'using json = nlohmann::json' (diff)
downloadnheko-b0e3c6d65ab914934e66c46ae1a53388b22125c0.tar.xz
Added escape handler for uploads (#1100)
* Added escape handler for uploads

* Update MessageView.qml

Changed if-else conditions to handle only one escape at a time
Diffstat (limited to 'resources/qml')
-rw-r--r--resources/qml/MessageView.qml8
1 files changed, 5 insertions, 3 deletions
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 541d20db..ef11f886 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -192,10 +192,12 @@ Item {
         Shortcut {
             sequence: StandardKey.Cancel
             onActivated: {
-                if (chat.model.reply)
-                chat.model.reply = undefined;
+                if(room.input.uploads.length > 0)
+                    room.input.declineUploads();
+                else if(chat.model.reply)
+                    chat.model.reply = undefined;
                 else
-                chat.model.edit = undefined;
+                    chat.model.edit = undefined;
             }
         }