Skip to content

php / x50-avatar

Go to a project
Commit 36712750 by doszhang
Options

Merge branch 'master' into release

parents 5c720eab c48b730f
Showing with 15 additions and 15 deletions
Public/static/js/common.js
...@@ -379,17 +379,17 @@ mc.on('pinchstart pinchmove pinchend', function (event) { ...@@ -379,17 +379,17 @@ mc.on('pinchstart pinchmove pinchend', function (event) {
} }
return false; return false;
}); });
mc.on('rotatestart rotatemove rotateend', function (event) { // mc.on('rotatestart rotatemove rotateend', function (event) {
if (!uploadedImg) { // if (!uploadedImg) {
return; // return;
} // }
if (event.type == 'rotatestart' || event.type == 'rotateend') { // if (event.type == 'rotatestart' || event.type == 'rotateend') {
oldpoz.rotation = 0; // oldpoz.rotation = 0;
} else { // } else {
var nowRotation = (event.rotation - oldpoz.rotation); // var nowRotation = (event.rotation - oldpoz.rotation);
oldpoz.rotation = event.rotation; // oldpoz.rotation = event.rotation;
imgInfo.rotation += nowRotation; // imgInfo.rotation += nowRotation;
drawImage(); // drawImage();
} // }
return false; // return false;
}); // });
\ No newline at end of file \ 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