diff --git a/src/js/filemanager.js b/src/js/filemanager.js index 76cf6f4ff..6cfaa62c4 100644 --- a/src/js/filemanager.js +++ b/src/js/filemanager.js @@ -1018,6 +1018,10 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl }); }); + function isModalVisible() { + return !!document.getElementsByClassName('modal in').length; + } + // handle save shortcuts window.addEventListener('keydown', function (event) { if((navigator.platform.match('Mac') ? event.metaKey : event.ctrlKey) && event.key === 's') { @@ -1028,23 +1032,27 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl } else if((navigator.platform.match('Mac') ? event.metaKey : event.ctrlKey) && event.key === 'c') { if ($scope.view === 'textEditor') return; if ($scope.selected.length === 0) return; + if (isModalVisible()) return; event.preventDefault(); $scope.$apply($scope.actionCopy); } else if((navigator.platform.match('Mac') ? event.metaKey : event.ctrlKey) && event.key === 'x') { if ($scope.view === 'textEditor') return; if ($scope.selected.length === 0) return; + if (isModalVisible()) return; event.preventDefault(); $scope.$apply($scope.actionCut); } else if((navigator.platform.match('Mac') ? event.metaKey : event.ctrlKey) && event.key === 'v') { if ($scope.view === 'textEditor') return; if ($scope.clipboard.length === 0) return; + if (isModalVisible()) return; event.preventDefault(); $scope.$apply($scope.actionPaste); } else if((navigator.platform.match('Mac') ? event.metaKey : event.ctrlKey) && event.key === 'a') { if ($scope.view === 'textEditor') return; + if (isModalVisible()) return; event.preventDefault(); $scope.$apply($scope.actionSelectAll);