@electerm/electerm-react 3.15.120 → 3.15.121
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
* check event if control/meta key pressed
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { isMacJs } from './constants'
|
|
6
6
|
export default e => {
|
|
7
7
|
if (e.metaKey && e.ctrlKey) {
|
|
8
8
|
return false
|
|
9
9
|
}
|
|
10
|
-
return
|
|
10
|
+
return isMacJs
|
|
11
11
|
? e.metaKey
|
|
12
12
|
: e.ctrlKey
|
|
13
13
|
}
|
|
@@ -25,7 +25,7 @@ import {
|
|
|
25
25
|
fileOperationsMap,
|
|
26
26
|
isWin, transferTypeMap, typeMap,
|
|
27
27
|
paneMap,
|
|
28
|
-
|
|
28
|
+
isMacJs, maxEditFileSize, ctrlOrCmd
|
|
29
29
|
} from '../../common/constants'
|
|
30
30
|
import sorter from '../../common/index-sorter'
|
|
31
31
|
import { getFolderFromFilePath, getLocalFileInfo } from './file-read'
|
|
@@ -508,8 +508,8 @@ export default class FileSection extends React.Component {
|
|
|
508
508
|
let selectedFiles = [file]
|
|
509
509
|
if (isSameSide) {
|
|
510
510
|
if (
|
|
511
|
-
(e.ctrlKey && !
|
|
512
|
-
(e.metaKey &&
|
|
511
|
+
(e.ctrlKey && !isMacJs) ||
|
|
512
|
+
(e.metaKey && isMacJs)
|
|
513
513
|
) {
|
|
514
514
|
const isSelected = some(
|
|
515
515
|
selectedFilesOld,
|