projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f57c87
)
Roo/bootstrap/UploadCropbox.js
author
edward
<edward@roojs.com>
Wed, 20 Jan 2016 07:57:05 +0000
(15:57 +0800)
committer
edward
<edward@roojs.com>
Wed, 20 Jan 2016 07:57:05 +0000
(15:57 +0800)
Roo/bootstrap/UploadCropbox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/UploadCropbox.js
b/Roo/bootstrap/UploadCropbox.js
index
a632774
..
68e85d5
100644
(file)
--- a/
Roo/bootstrap/UploadCropbox.js
+++ b/
Roo/bootstrap/UploadCropbox.js
@@
-297,8
+297,11
@@
Roo.extend(Roo.bootstrap.UploadCropbox, Roo.bootstrap.Component, {
var height = this.image.OriginHeight * Math.pow(1.1, scale)
if(
- width < this.thumb.getWidth() ||
- height < this.thumb.getHeight()
+ e.getWheelDelta() == -1 &&
+ (
+ width < this.thumb.getWidth() ||
+ height < this.thumb.getHeight()
+ )
){
return;
}