Public/pics
2
2
Fork 2
Code Issues 6 Pull Requests 2 Releases Wiki Activity

Make crop editor usable #22

Merged
Aaron merged 27 commits from crop-editor into master 2020-12-30 20:06:17 +01:00
Conversation 0 Commits 27 Files Changed 7 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93884e2e93 - Show all commits

6
public/js/crop_editor.js
View File

@ -94,7 +94,7 @@ class CropEditor {
// Cropping from the centre? // Cropping from the centre?
if (cropMethod === "c") { if (cropMethod === "c") {
// Crop vertically from the centre, using the entire width. // Crop vertically from the centre, using the entire width.
if (sourceAspectRatio < cropAspectRatio) { if (sourceAspectRatio <= cropAspectRatio) {
this.crop_width.value = source.naturalWidth; this.crop_width.value = source.naturalWidth;
this.crop_height.value = Math.ceil(source.naturalWidth / cropAspectRatio); this.crop_height.value = Math.ceil(source.naturalWidth / cropAspectRatio);
this.source_x.value = 0; this.source_x.value = 0;
@ -111,9 +111,9 @@ class CropEditor {
// Cropping a top or bottom slice? // Cropping a top or bottom slice?
else { else {
// Can we actually take a top or bottom slice from the original image? // Can we actually take a top or bottom slice from the original image?
if (sourceAspectRatio < cropAspectRatio) { if (sourceAspectRatio <= cropAspectRatio) {
this.crop_width.value = source.naturalWidth; this.crop_width.value = source.naturalWidth;
this.crop_height.value = Math.floor(source.naturalHeight / cropAspectRatio); this.crop_height.value = Math.floor(source.naturalWidth / cropAspectRatio);
this.source_x.value = "0"; this.source_x.value = "0";
this.source_y.value = cropMethod.indexOf("t") !== -1 ? "0" : source.naturalHeight - this.crop_height.value; this.source_y.value = cropMethod.indexOf("t") !== -1 ? "0" : source.naturalHeight - this.crop_height.value;
} }