haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
plt
2019-07-02 14:52:20 +08:00
parent 47a23e23b8 c24ecf8b50
commit 18b887a283
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/package-lock.json generated
View File

@@ -433,9 +433,9 @@
"integrity": "sha512-YsAX+gnnf1ytv7asZgJP7T56DALQniKtRVtlz0f11PljLV19I1Av+Oz3QcYaRiKhCCB+EMnVKI9Yc14sYKp6lA==" "integrity": "sha512-YsAX+gnnf1ytv7asZgJP7T56DALQniKtRVtlz0f11PljLV19I1Av+Oz3QcYaRiKhCCB+EMnVKI9Yc14sYKp6lA=="
}, },
"@seafile/seafile-editor": { "@seafile/seafile-editor": {
"version": "0.2.45", "version": "0.2.46",
"resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.45.tgz", "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.46.tgz",
"integrity": "sha512-MizbTOBB33/8uB1TceMNjN2nktMcrhp011LSrK6ckbFuM6PLmDbCim7u3EUpj9+ym/Ks0UG2B7+beCtgfFrbiw==", "integrity": "sha512-s16LW9ex20wVpwnImJBQgnSNkPo1505x1RJ3hMR912vfx6DvXfbduALI54f593acCeM2Kzqg81QZ7Ma8UVHpFA==",
"requires": { "requires": {
"@seafile/slate-react": "^0.1.8", "@seafile/slate-react": "^0.1.8",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",
@@ -5230,9 +5230,9 @@
} }
}, },
"dom-align": { "dom-align": {
"version": "1.8.3", "version": "1.9.0",
"resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.8.3.tgz", "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.9.0.tgz",
"integrity": "sha512-thE1qB8mvtRZgwN4+IGFz1rv7zVsr08c2/IEYtOJIeTzW4YDadIOd5nQ4BpiiAvUWg55xTeGq7zLTDxDYWDrnw==" "integrity": "sha512-HvPfXISxoU7dKrbqS4vIFa1hx88wD7VdKaZ7sHWeow8y76tuzsxXkiPGbeilemLXrTd9cWbPqR4MOl4y3dkcXA=="
}, },
"dom-converter": { "dom-converter": {
"version": "0.1.4", "version": "0.1.4",
@@ -14530,9 +14530,9 @@
} }
}, },
"rc-calendar": { "rc-calendar": {
"version": "9.15.2", "version": "9.15.3",
"resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.2.tgz", "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.3.tgz",
"integrity": "sha512-eLYXH3aYEfhJiytHVTnNp5k887nqBdwyH9gRH+PJQ3p3Yt/EFw03tTza32LuU8eA3tMUMgYonW90TvPsJ8is8g==", "integrity": "sha512-Z1pmNkdNIbCGNU/IWHbPK5/9DXzpDsN3aZQYJ3UnOrvOWEcQZhBHzc7g1qTBO1iWiIwn6nphpOWkonVdRzKqvg==",
"requires": { "requires": {
"babel-runtime": "6.x", "babel-runtime": "6.x",
"classnames": "2.x", "classnames": "2.x",
@@ -15904,9 +15904,9 @@
} }
}, },
"seafile-js": { "seafile-js": {
"version": "0.2.97", "version": "0.2.99",
"resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.97.tgz", "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.99.tgz",
"integrity": "sha512-a7nlJ4FadqPrsF83GkrKZQem6lQLwm/eDhQc5Ovl5UYw3b1VWz/RARhEO70WKVPtwfmShwKTeRyEZCYVW51edg==", "integrity": "sha512-OARVnhkOXG2T5gFd8AvkGp3nLCHEUqxbnONWAMcMI1UaPKZ4fS+ayww2qfs/jHRVGHLZEIiBGjs9bowORJp3Dw==",
"requires": { "requires": {
"axios": "^0.18.0", "axios": "^0.18.0",
"form-data": "^2.3.2", "form-data": "^2.3.2",

4
frontend/package.json
View File

@@ -6,7 +6,7 @@
"@reach/router": "^1.2.0", "@reach/router": "^1.2.0",
"@seafile/dtable": "0.0.46", "@seafile/dtable": "0.0.46",
"@seafile/resumablejs": "^1.1.9", "@seafile/resumablejs": "^1.1.9",
"@seafile/seafile-editor": "^0.2.45", "@seafile/seafile-editor": "^0.2.46",
"MD5": "^1.3.0", "MD5": "^1.3.0",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",
"classnames": "^2.2.6", "classnames": "^2.2.6",
@@ -37,7 +37,7 @@
"react-responsive": "^6.1.1", "react-responsive": "^6.1.1",
"react-select": "^2.4.1", "react-select": "^2.4.1",
"reactstrap": "^6.4.0", "reactstrap": "^6.4.0",
"seafile-js": "^0.2.97", "seafile-js": "^0.2.99",
"socket.io-client": "^2.2.0", "socket.io-client": "^2.2.0",
"sw-precache-webpack-plugin": "0.11.4", "sw-precache-webpack-plugin": "0.11.4",
"unified": "^7.0.0", "unified": "^7.0.0",

8
frontend/src/components/dialog/lib-history-setting-dialog.js
View File

@@ -61,6 +61,13 @@ class LibHistorySetting extends React.Component {
} }
} }
handleKeyPress = (e) => {
if (e.key === 'Enter') {
this.submit();
e.preventDefault();
}
}
onChange = (e) => { onChange = (e) => {
let num = e.target.value; let num = e.target.value;
this.setState({ this.setState({
@@ -123,6 +130,7 @@ class LibHistorySetting extends React.Component {
value={this.state.expireDays} value={this.state.expireDays}
onChange={this.onChange} onChange={this.onChange}
disabled={this.state.disabled} disabled={this.state.disabled}
onKeyDown={this.handleKeyPress}
/>{' '} />{' '}
<Label><span>{gettext('days')}</span></Label> <Label><span>{gettext('days')}</span></Label>
</FormGroup> </FormGroup>