Commit 36712750 by doszhang

Merge branch 'master' into release

parents 5c720eab c48b730f
......@@ -379,17 +379,17 @@ mc.on('pinchstart pinchmove pinchend', function (event) {
}
return false;
});
mc.on('rotatestart rotatemove rotateend', function (event) {
if (!uploadedImg) {
return;
}
if (event.type == 'rotatestart' || event.type == 'rotateend') {
oldpoz.rotation = 0;
} else {
var nowRotation = (event.rotation - oldpoz.rotation);
oldpoz.rotation = event.rotation;
imgInfo.rotation += nowRotation;
drawImage();
}
return false;
});
\ No newline at end of file
// mc.on('rotatestart rotatemove rotateend', function (event) {
// if (!uploadedImg) {
// return;
// }
// if (event.type == 'rotatestart' || event.type == 'rotateend') {
// oldpoz.rotation = 0;
// } else {
// var nowRotation = (event.rotation - oldpoz.rotation);
// oldpoz.rotation = event.rotation;
// imgInfo.rotation += nowRotation;
// drawImage();
// }
// return false;
// });
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment