Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0
This commit is contained in:
commit
22d2b83a31
@ -308,7 +308,7 @@ actions.prototype.ondown = function (loc) {
|
|||||||
|
|
||||||
// 画板
|
// 画板
|
||||||
if (core.status.played && (core.status.event||{}).id=='paint') {
|
if (core.status.played && (core.status.event||{}).id=='paint') {
|
||||||
this.ondownPaint(loc.x, loc.y);
|
this.ondownPaint(loc.x/core.domStyle.scale, loc.y/core.domStyle.scale);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -346,7 +346,7 @@ actions.prototype.onmove = function (loc) {
|
|||||||
|
|
||||||
// 画板
|
// 画板
|
||||||
if (core.status.played && (core.status.event||{}).id=='paint') {
|
if (core.status.played && (core.status.event||{}).id=='paint') {
|
||||||
this.onmovePaint(loc.x, loc.y)
|
this.onmovePaint(loc.x/core.domStyle.scale, loc.y/core.domStyle.scale)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
3
main.js
3
main.js
@ -381,8 +381,9 @@ main.dom.data.ontouchmove = function (e) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
////// 手指离开触摸屏时 //////
|
////// 手指离开触摸屏时 //////
|
||||||
main.dom.data.ontouchend = function () {
|
main.dom.data.ontouchend = function (e) {
|
||||||
try {
|
try {
|
||||||
|
e.preventDefault();
|
||||||
main.core.onup();
|
main.core.onup();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user