Skip to content
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

Jump to bottom

Crop preset review #84

Merged
merged 11 commits into from
Oct 31, 2018
Merged

Crop preset review #84

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6ea90ba
For pr review
jinwoo-kim-nhn Oct 30, 2018
1cc54e1
some refector
jinwoo-kim-nhn Oct 30, 2018
642f5aa
fixed code from review
jinwoo-kim-nhn Oct 30, 2018
76c3406
fixed use snippet 'map' and 'foreach' for ie9
jinwoo-kim-nhn Oct 31, 2018
a556ef6
Changed method declaration order of cropper.js
jinwoo-kim-nhn Oct 31, 2018
d8ec604
fixed test code
jinwoo-kim-nhn Oct 31, 2018
67935b3
Apply code review
jinwoo-kim-nhn Oct 31, 2018
8478bf7
refactor: change argument name
jinwoo-kim-nhn Oct 31, 2018
8da6601
Merge branch 'master' into crop-preset-review
jinwoo-kim-nhn Oct 31, 2018
4fee353
fixed conflict
jinwoo-kim-nhn Oct 31, 2018
7e14b16
apply codereview for css
jinwoo-kim-nhn Oct 31, 2018
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
Prev Previous commit
Next Next commit
refactor: change argument name
  • Loading branch information
@jinwoo-kim-nhn
jinwoo-kim-nhn committed Oct 31, 2018
commit 8478bf76f5008f7a423d51e031d45529585cb572
18 changes: 9 additions & 9 deletions src/js/component/cropper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,48 +286,48 @@ class Cropper extends Component {

/**
* Set a cropzone square
* @param {number} [scale] - preset ratio
* @param {number} [presetRatio] - preset ratio
*/
setCropzoneRect(scale) {
setCropzoneRect(presetRatio) {
const canvas = this.getCanvas();
const cropzone = this._cropzone;

canvas.deactivateAll();
canvas.selection = false;
cropzone.remove();

cropzone.set(scale ? this._getPresetCropSizePosition(scale) : DEFAULT_OPTION);
cropzone.set(presetRatio ? this._getPresetCropSizePosition(presetRatio) : DEFAULT_OPTION);

canvas.add(cropzone);
canvas.selection = true;

if (scale) {
if (presetRatio) {
canvas.setActiveObject(cropzone);
}
}

/**
* Set a cropzone square
* @param {number} scale - preset ratio
* @param {number} presetRatio - preset ratio
* @returns {{left: number, top: number, width: number, height: number}}
* @private
*/
_getPresetCropSizePosition(scale) {
_getPresetCropSizePosition(presetRatio) {
const canvas = this.getCanvas();
const originalWidth = canvas.getWidth();
const originalHeight = canvas.getHeight();

const standardSize = (originalWidth >= originalHeight) ? originalWidth : originalHeight;
const getScale = (value, orignalValue) => (value > orignalValue) ? orignalValue / value : 1;
jungeun-cho marked this conversation as resolved.
Show resolved Hide resolved

let width = standardSize * scale;
let width = standardSize * presetRatio;
let height = standardSize;

const scaleWidth = getScale(width, originalWidth);
[width, height] = snippet.map([width, height], sizeValue => (sizeValue * scaleWidth));
[width, height] = snippet.map([width, height], sizeValue => sizeValue * scaleWidth);

const scaleHeight = getScale(height, originalHeight);
[width, height] = snippet.map([width, height], sizeValue => (sizeValue * scaleHeight));
[width, height] = snippet.map([width, height], sizeValue => sizeValue * scaleHeight);

return {
top: (originalHeight - height) / 2,
Expand Down