Skip to content

Limit user photo uploads to 512x512 pixels #2004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2016
Merged

Limit user photo uploads to 512x512 pixels #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"css-loader": "0.23.1",
"currency-codes": "^1.1.2",
"deep-freeze": "0.0.1",
"detect-browser": "^1.5.0",
"enzyme": "^2.4.1",
"eslint": "^3.11.1",
"eslint-config-defaults": "9.0.0",
Expand Down
13 changes: 10 additions & 3 deletions static/js/components/CropperWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow
import React from 'react';
import Cropper from 'react-cropper';
import browser from 'detect-browser';

export default class CropperWrapper extends React.Component {
props: {
Expand All @@ -11,10 +12,16 @@ export default class CropperWrapper extends React.Component {

cropperHelper = () => {
const { updatePhotoEdit } = this.props;
let canvas = this.refs.cropper.getCroppedCanvas();
if (canvas.toBlob !== undefined) {
canvas.toBlob(blob => updatePhotoEdit(blob), 'image/jpeg');
let canvas;
if ( browser.name === 'safari' || browser.name === 'ios' ) {
canvas = this.refs.cropper.getCroppedCanvas();
} else {
canvas = this.refs.cropper.getCroppedCanvas({
width: 512,
height: 512,
});
}
canvas.toBlob(blob => updatePhotoEdit(blob), 'image/jpeg');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We used to check for toBlob here. Will it always exist?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we have a polyfill for it.

};

render () {
Expand Down