mirror of
				https://github.com/node-red/node-red.git
				synced 2025-03-01 10:36:34 +00:00 
			
		
		
		
	Merge pull request #3195 from node-red/keyboard-fix
Avoid conflicts with native browser cmd-ctrl type shortcuts
This commit is contained in:
		@@ -243,7 +243,13 @@ RED.keyboard = (function() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    function resolveKeyEvent(evt) {
 | 
					    function resolveKeyEvent(evt) {
 | 
				
			||||||
        var slot = partialState||handlers;
 | 
					        var slot = partialState||handlers;
 | 
				
			||||||
        if (evt.ctrlKey || evt.metaKey) {
 | 
					        // We cheat with MacOS CMD key and consider it the same as Ctrl.
 | 
				
			||||||
 | 
					        // That means we don't have to have separate keymaps for different OS.
 | 
				
			||||||
 | 
					        // It mostly works.
 | 
				
			||||||
 | 
					        // One exception is shortcuts that include both Cmd and Ctrl. We don't
 | 
				
			||||||
 | 
					        // support them - but we need to make sure we don't block browser-specific
 | 
				
			||||||
 | 
					        // shortcuts (such as Cmd-Ctrl-F for fullscreen).
 | 
				
			||||||
 | 
					        if ((evt.ctrlKey || evt.metaKey) && (evt.ctrlKey !== evt.metaKey)) {
 | 
				
			||||||
            slot = slot.ctrl;
 | 
					            slot = slot.ctrl;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (slot && evt.shiftKey) {
 | 
					        if (slot && evt.shiftKey) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user