15308555518/ frontend
1
0
Fork 0
mirror of https://github.com/cloudreve/frontend.git synced 2026-01-01 02:42:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: conflicts

This commit is contained in:
HFO4 2020-04-29 08:48:30 +08:00
parent 19138ace42 2f4156520e
commit 80e0b6e4e0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/component/FileManager/Explorer.js
View File

@ -16,6 +16,7 @@ import SadIcon from "@material-ui/icons/SentimentVeryDissatisfied";
import classNames from "classnames";
import ImgPreivew from "./ImgPreview";
import pathHelper from "../../utils/page";
import { isMac } from "../../utils"
import { withRouter } from "react-router-dom";
import {
Table,
@ -177,7 +178,7 @@ class ExplorerCompoment extends Component {
super();
this.keyMap = {
DELETE_FILE: "del",
SELECT_ALL: "ctrl+a"
SELECT_ALL: `${isMac() ? 'command' : 'ctrl'}+a`
};
this.handlers = {

4
src/utils/index.js
View File

@ -188,4 +188,8 @@ export function getNumber(base,conditions){
}
})
return base
}
export const isMac = () => {
return "MACINTEL" === navigator.platform.toUpperCase()
}