projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5228a0b
)
Roo/dialog/UploadCropbox.js
author
leon
<leon@roojs.com>
Wed, 10 Aug 2022 03:55:00 +0000
(11:55 +0800)
committer
leon
<leon@roojs.com>
Wed, 10 Aug 2022 03:55:00 +0000
(11:55 +0800)
Roo/dialog/UploadCropbox.js
patch
|
blob
|
history
diff --git
a/Roo/dialog/UploadCropbox.js
b/Roo/dialog/UploadCropbox.js
index
3b59fde
..
693ec06
100644
(file)
--- a/
Roo/dialog/UploadCropbox.js
+++ b/
Roo/dialog/UploadCropbox.js
@@
-563,16
+563,13
@@
Roo.extend(Roo.dialog.UploadCropbox, Roo.Component, {
if ((this.imageEl.OriginWidth / this.imageEl.OriginHeight >= this.minWidth / this.minHeight)) {
maxPaddingTop = (this.canvasEl.width * this.minHeight / this.minWidth - this.canvasEl.height) / 2 + maxPaddingLeft;
}
if ((this.imageEl.OriginWidth / this.imageEl.OriginHeight >= this.minWidth / this.minHeight)) {
maxPaddingTop = (this.canvasEl.width * this.minHeight / this.minWidth - this.canvasEl.height) / 2 + maxPaddingLeft;
}
-
- var testX = Math.ceil(this.thumbEl.getLeft(true) + this.thumbEl.getWidth() - this.canvasEl.width - maxPaddingLeft);
- var testY = Math.ceil(this.thumbEl.getTop(true) + this.thumbEl.getHeight() - this.canvas.height - maxPaddingTop);
-
- var minX = Math.ceil(this.thumbEl.getLeft(true));
- var minY = Math.ceil(this.thumbEl.getTop(true));
+ var minX = Math.ceil(this.thumbEl.getLeft(true)
+ this.thumbEl.getWidth() - this.canvasEl.width - maxPaddingLeft
);
+ var minY = Math.ceil(this.thumbEl.getTop(true)
+ this.thumbEl.getHeight() - this.canvas.height - maxPaddingTop
);
- var maxX = Math.ceil(minX + this.thumbEl.getWidth() - this.canvasEl.width);
- var maxY = Math.ceil(minY + this.thumbEl.getHeight() - this.canvasEl.height);
+ var maxX = Math.ceil(this.thumbEl.getLeft(true) + maxPaddingLeft);
+ var maxY = Math.ceil(this.thumbEl.getTop(true) + maxPaddingTop);
+
if(minX > maxX) {
var tempX = minX;
if(minX > maxX) {
var tempX = minX;