yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into templates/questions

Browse Source
This commit is contained in:
Jim LAURIE 2020-09-28 14:57:07 +02:00 committed by GitHub
commit 2efb5e4064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/strapi-plugin-upload/admin/src/components/EditForm/index.js
View File

@ -153,19 +153,23 @@ const EditForm = forwardRef(
try { try {
const canvas = cropper.current.getCroppedCanvas(); const canvas = cropper.current.getCroppedCanvas();
canvas.toBlob(async blob => { canvas.toBlob(
const { async blob => {
file: { lastModifiedDate, lastModified, name }, const {
} = fileToEdit; file: { lastModifiedDate, lastModified, name },
} = fileToEdit;
resolve( resolve(
new File([blob], name, { new File([blob], name, {
type: mimeType, type: mimeType,
lastModified, lastModified,
lastModifiedDate, lastModifiedDate,
}) })
); );
}); },
mimeType,
1
);
} catch (err) { } catch (err) {
reject(); reject();
} }

2
packages/strapi/package.json
View File

@ -30,7 +30,7 @@
"inquirer": "^6.2.1", "inquirer": "^6.2.1",
"is-docker": "2.1.1", "is-docker": "2.1.1",
"koa": "^2.8.0", "koa": "^2.8.0",
"koa-body": "^4.1.0", "koa-body": "^4.2.0",
"koa-compose": "^4.1.0", "koa-compose": "^4.1.0",
"koa-compress": "^3.0.0", "koa-compress": "^3.0.0",
"koa-convert": "^1.2.0", "koa-convert": "^1.2.0",

8
yarn.lock
View File

@ -11163,10 +11163,10 @@ known-css-properties@^0.14.0:
resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.14.0.tgz#d7032b4334a32dc22e6e46b081ec789daf18756c" resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.14.0.tgz#d7032b4334a32dc22e6e46b081ec789daf18756c"
integrity sha512-P+0a/gBzLgVlCnK8I7VcD0yuYJscmWn66wH9tlKsQnmVdg689tLEmziwB9PuazZYLkcm07fvWOKCJJqI55sD5Q== integrity sha512-P+0a/gBzLgVlCnK8I7VcD0yuYJscmWn66wH9tlKsQnmVdg689tLEmziwB9PuazZYLkcm07fvWOKCJJqI55sD5Q==
koa-body@^4.1.0: koa-body@^4.2.0:
version "4.1.1" version "4.2.0"
resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-4.1.1.tgz#50686d290891fc6f1acb986cf7cfcd605f855ef0" resolved "https://registry.yarnpkg.com/koa-body/-/koa-body-4.2.0.tgz#37229208b820761aca5822d14c5fc55cee31b26f"
integrity sha512-rLb/KVD8qplEcK8Qsu6F4Xw+uHkmx3MWogDVmMX07DpjXizhw3pOEp1ja1MqqAcl0ei75AsrbGVDlySmsUrreA== integrity sha512-wdGu7b9amk4Fnk/ytH8GuWwfs4fsB5iNkY8kZPpgQVb04QZSv85T0M8reb+cJmvLE8cjPYvBzRikD3s6qz8OoA==
dependencies: dependencies:
"@types/formidable" "^1.0.31" "@types/formidable" "^1.0.31"
co-body "^5.1.1" co-body "^5.1.1"