jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix bug

Browse Source
This commit is contained in:
ckcz123 2019-12-31 17:53:30 +08:00
parent b8628b5ff9
commit bc791cf681
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/events.js
View File

@ -842,8 +842,13 @@ events.prototype.doEvent = function (data, x, y, prefix) {
events.prototype.setEvents = function (list, x, y, callback) { events.prototype.setEvents = function (list, x, y, callback) {
var data = core.status.event.data || {}; var data = core.status.event.data || {};
if (list) if (list) {
data.list = [{todo: core.clone(list), total: core.clone(list), condition: "false"}]; data.list = [{todo: core.clone(list), total: core.clone(list), condition: "false"}];
// 结束所有正在执行的自动事件
core.status.autoEvents.forEach(function (autoEvent) {
core.autoEventExecuting(autoEvent.symbol, null);
});
}
if (x != null) data.x = x; if (x != null) data.x = x;
if (y != null) data.y = y; if (y != null) data.y = y;
if (callback) data.callback = callback; if (callback) data.callback = callback;

7
main.js
View File

@ -489,6 +489,7 @@ main.dom.data.ontouchstart = function (e) {
e.preventDefault(); e.preventDefault();
var loc = main.core.actions._getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY); var loc = main.core.actions._getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY);
if (loc == null) return; if (loc == null) return;
main.lastTouchLoc = loc;
main.core.ondown(loc); main.core.ondown(loc);
}catch (ee) { main.log(ee); } }catch (ee) { main.log(ee); }
} }
@ -499,6 +500,7 @@ main.dom.data.ontouchmove = function (e) {
e.preventDefault(); e.preventDefault();
var loc = main.core.actions._getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY); var loc = main.core.actions._getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY);
if (loc == null) return; if (loc == null) return;
main.lastTouchLoc = loc;
main.core.onmove(loc); main.core.onmove(loc);
}catch (ee) { main.log(ee); } }catch (ee) { main.log(ee); }
} }
@ -507,8 +509,9 @@ main.dom.data.ontouchmove = function (e) {
main.dom.data.ontouchend = function (e) { main.dom.data.ontouchend = function (e) {
try { try {
e.preventDefault(); e.preventDefault();
var loc = main.core.actions._getClickLoc(e.targetTouches[0].clientX, e.targetTouches[0].clientY); if (main.lastTouchLoc == null) return;
if (loc == null) return; var loc = main.lastTouchLoc;
delete main.lastTouchLoc;
main.core.onup(loc); main.core.onup(loc);
} catch (e) { } catch (e) {
main.log(e); main.log(e);