haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 16:31:13 +00:00
Code Issues Releases Wiki Activity

check-diff (#2535)

Browse Source
This commit is contained in:
MichaelAn
2018-11-16 14:35:44 +08:00
committed by Daniel Pan
parent 4785bd2c74
commit abb29a3c9d
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/package-lock.json generated
View File

@@ -108,9 +108,9 @@
"integrity": "sha512-RTEJHxaEBHMC9bX2v04pfnI7YvFZhRxzilRpkhdJrNMUekVYFYW/C7N7g2DtoXXOrMoWin+okrVKpbp4xUICOA==" "integrity": "sha512-RTEJHxaEBHMC9bX2v04pfnI7YvFZhRxzilRpkhdJrNMUekVYFYW/C7N7g2DtoXXOrMoWin+okrVKpbp4xUICOA=="
}, },
"@seafile/seafile-editor": { "@seafile/seafile-editor": {
"version": "0.1.36", "version": "0.1.37",
"resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.1.36.tgz", "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.1.37.tgz",
"integrity": "sha512-uy95+FW6aIIA1BPxP+N91/QV+s152ZFMwUtKhBtCQ3xC/1zoaCSXDYurjudQ0CwB60Fc9z3XR0XEUCHJu28zVg==", "integrity": "sha512-9P4HC8zH6xZ4ye/52XLEjASYAfodnytZkWVzA+ZsM9d4JrbWywPLwy5NR/KFx5wu6SfGGAglcsUljBj1hjT3Fw==",
"requires": { "requires": {
"@seafile/slate-react": "0.1.2", "@seafile/slate-react": "0.1.2",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",
@@ -167,6 +167,7 @@
"slate-html-serializer": "0.7.2", "slate-html-serializer": "0.7.2",
"slate-schema-violations": "0.1.39", "slate-schema-violations": "0.1.39",
"socket.io-client": "^2.1.1", "socket.io-client": "^2.1.1",
"string-similarity": "^2.0.0",
"style-loader": "0.19.0", "style-loader": "0.19.0",
"toggle-selection": "^1.0.6", "toggle-selection": "^1.0.6",
"unified": "^6.1.6", "unified": "^6.1.6",
@@ -254,9 +255,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "10.12.7", "version": "10.12.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.7.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.9.tgz",
"integrity": "sha512-Zh5Z4kACfbeE8aAOYh9mqotRxaZMro8MbBQtR8vEXOMiZo2rGEh2LayJijKdlu48YnS6y2EFU/oo2NCe5P6jGw==" "integrity": "sha512-eajkMXG812/w3w4a1OcBlaTwsFPO5F7fJ/amy+tieQxEMWBlbV1JGSjkFM+zkHNf81Cad+dfIRA+IBkvmvdAeA=="
}, },
"MD5": { "MD5": {
"version": "1.3.0", "version": "1.3.0",
@@ -3481,7 +3482,7 @@
}, },
"engine.io-client": { "engine.io-client": {
"version": "3.2.1", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
"requires": { "requires": {
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
@@ -9658,7 +9659,7 @@
}, },
"react-popper": { "react-popper": {
"version": "0.8.3", "version": "0.8.3",
"resolved": "https://registry.npmjs.org/react-popper/-/react-popper-0.8.3.tgz", "resolved": "http://registry.npmjs.org/react-popper/-/react-popper-0.8.3.tgz",
"integrity": "sha1-D3MzMTfJ+wr27EB00tBYWgoEYeE=", "integrity": "sha1-D3MzMTfJ+wr27EB00tBYWgoEYeE=",
"requires": { "requires": {
"popper.js": "^1.12.9", "popper.js": "^1.12.9",
@@ -10797,7 +10798,7 @@
}, },
"socket.io-parser": { "socket.io-parser": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
"integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
"requires": { "requires": {
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
@@ -11052,6 +11053,11 @@
"strip-ansi": "^3.0.0" "strip-ansi": "^3.0.0"
} }
}, },
"string-similarity": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/string-similarity/-/string-similarity-2.0.0.tgz",
"integrity": "sha512-62FBZrVXV5cI23bQ9L49Y4d9u9yaH61JhAwLyUFUzQbHDjdihxdfCwIherg+vylR/s4ucCddK8iKSEO7kinffQ=="
},
"string-width": { "string-width": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",

2
frontend/package.json
View File

@@ -5,7 +5,7 @@
"dependencies": { "dependencies": {
"@reach/router": "^1.2.0", "@reach/router": "^1.2.0",
"@seafile/resumablejs": "^1.1.6", "@seafile/resumablejs": "^1.1.6",
"@seafile/seafile-editor": "^0.1.36", "@seafile/seafile-editor": "^0.1.37",
"MD5": "^1.3.0", "MD5": "^1.3.0",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",
"classnames": "^2.2.6", "classnames": "^2.2.6",

4
frontend/src/draft-review.js
View File

@@ -245,9 +245,9 @@ class DraftReview extends React.Component {
: :
<div className="markdown-viewer-render-content article"> <div className="markdown-viewer-render-content article">
{this.state.isShowDiff ? {this.state.isShowDiff ?
<DiffViewer markdownContent={this.state.draftContent} markdownContent1={this.state.draftOriginContent} /> <DiffViewer newMarkdownContent={this.state.draftContent} oldMarkdownContent={this.state.draftOriginContent} />
: :
<DiffViewer markdownContent={this.state.draftContent} markdownContent1={this.state.draftContent} /> <DiffViewer newMarkdownContent={this.state.draftContent} oldMarkdownContent={this.state.draftContent} />
} }
</div> </div>
} }