Merge pull request #7033 from RocketChat/fix-ctrl-message

[FIX] Prevent Ctrl key on message field from reloading messages list
RocketChat · May 24, 2017 · caeea79 · caeea79
2 parents 08e33dd + 2b7b28a
commit caeea79
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -477,9 +477,11 @@ this.ChatMessages = class ChatMessages {
 			return false;
 
 				// ctrl (command) + shift + k -> clear room messages
-		} else if (k === 75 && navigator && navigator.platform && event.shiftKey && (navigator.platform.indexOf('Mac') !== -1 && event.metaKey) || event.ctrlKey) {
-			return RoomHistoryManager.clear(rid);
 		}
+		// TODO
+		// else if (k === 75 && navigator && navigator.platform && event.shiftKey && (navigator.platform.indexOf('Mac') !== -1 ? event.metaKey : event.ctrlKey)) {
+		// 	return RoomHistoryManager.clear(rid);
+		// }
 	}
 
 	valueChanged(/*rid, event*/) {