Merge branch 'master' of gitea.iwm-tuebingen.de:IWMBrowser/iwmlib
This commit is contained in:
commit
c8e2bea8fa
15
dist/iwmlib.js
vendored
15
dist/iwmlib.js
vendored
@ -1928,7 +1928,7 @@
|
||||
registerTap(key, point) {
|
||||
if (this.tapCounts.has(key)) {
|
||||
let count = this.tapCounts.get(key);
|
||||
this.tapCounts.set(key, count+1);
|
||||
this.tapCounts.set(key, count + 1);
|
||||
}
|
||||
else {
|
||||
this.tapCounts.set(key, 1);
|
||||
@ -1978,7 +1978,7 @@
|
||||
}
|
||||
let result = false;
|
||||
if (this.isTap(key)) {
|
||||
|
||||
|
||||
this.registerTap(key, ended);
|
||||
result = this.tapCounts.get(key) == 2;
|
||||
}
|
||||
@ -2119,7 +2119,7 @@
|
||||
element.addEventListener(
|
||||
'pointerup',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerup');
|
||||
if (this.debug) console.log('pointerup', e.pointerId, e.pointerType);
|
||||
this.onEnd(e);
|
||||
if (this.capturePointerEvents) {
|
||||
try {
|
||||
@ -2132,7 +2132,7 @@
|
||||
element.addEventListener(
|
||||
'pointercancel',
|
||||
e => {
|
||||
if (this.debug) console.log('pointercancel');
|
||||
if (this.debug) console.log('pointercancel', e.pointerId, e.pointerType);
|
||||
this.onEnd(e);
|
||||
if (this.capturePointerEvents)
|
||||
element.releasePointerCapture(e.pointerId);
|
||||
@ -2144,7 +2144,7 @@
|
||||
element.addEventListener(
|
||||
'pointerleave',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerleave');
|
||||
if (this.debug) console.log('pointerleave', e.pointerId, e.pointerType);
|
||||
if (e.target == element) this.onEnd(e);
|
||||
},
|
||||
useCapture
|
||||
@ -2155,7 +2155,7 @@
|
||||
element.addEventListener(
|
||||
'pointerout',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerout');
|
||||
if (this.debug) console.log('pointerout', e.pointerId, e.pointerType);
|
||||
if (e.target == element) this.onEnd(e);
|
||||
},
|
||||
useCapture
|
||||
@ -2166,8 +2166,9 @@
|
||||
window.addEventListener(
|
||||
'pointerout',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerout', e.pointerId, e.pointerType, e.target);
|
||||
if (e.target == element) {
|
||||
this.onEnd(e);
|
||||
this.onEnd(e);
|
||||
}
|
||||
},
|
||||
useCapture);
|
||||
|
15
dist/iwmlib.pixi.js
vendored
15
dist/iwmlib.pixi.js
vendored
@ -5092,7 +5092,7 @@
|
||||
registerTap(key, point) {
|
||||
if (this.tapCounts.has(key)) {
|
||||
let count = this.tapCounts.get(key);
|
||||
this.tapCounts.set(key, count+1);
|
||||
this.tapCounts.set(key, count + 1);
|
||||
}
|
||||
else {
|
||||
this.tapCounts.set(key, 1);
|
||||
@ -5142,7 +5142,7 @@
|
||||
}
|
||||
let result = false;
|
||||
if (this.isTap(key)) {
|
||||
|
||||
|
||||
this.registerTap(key, ended);
|
||||
result = this.tapCounts.get(key) == 2;
|
||||
}
|
||||
@ -5283,7 +5283,7 @@
|
||||
element.addEventListener(
|
||||
'pointerup',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerup');
|
||||
if (this.debug) console.log('pointerup', e.pointerId, e.pointerType);
|
||||
this.onEnd(e);
|
||||
if (this.capturePointerEvents) {
|
||||
try {
|
||||
@ -5296,7 +5296,7 @@
|
||||
element.addEventListener(
|
||||
'pointercancel',
|
||||
e => {
|
||||
if (this.debug) console.log('pointercancel');
|
||||
if (this.debug) console.log('pointercancel', e.pointerId, e.pointerType);
|
||||
this.onEnd(e);
|
||||
if (this.capturePointerEvents)
|
||||
element.releasePointerCapture(e.pointerId);
|
||||
@ -5308,7 +5308,7 @@
|
||||
element.addEventListener(
|
||||
'pointerleave',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerleave');
|
||||
if (this.debug) console.log('pointerleave', e.pointerId, e.pointerType);
|
||||
if (e.target == element) this.onEnd(e);
|
||||
},
|
||||
useCapture
|
||||
@ -5319,7 +5319,7 @@
|
||||
element.addEventListener(
|
||||
'pointerout',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerout');
|
||||
if (this.debug) console.log('pointerout', e.pointerId, e.pointerType);
|
||||
if (e.target == element) this.onEnd(e);
|
||||
},
|
||||
useCapture
|
||||
@ -5330,8 +5330,9 @@
|
||||
window.addEventListener(
|
||||
'pointerout',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerout', e.pointerId, e.pointerType, e.target);
|
||||
if (e.target == element) {
|
||||
this.onEnd(e);
|
||||
this.onEnd(e);
|
||||
}
|
||||
},
|
||||
useCapture);
|
||||
|
@ -363,7 +363,7 @@ export class Interaction extends InteractionPoints {
|
||||
registerTap(key, point) {
|
||||
if (this.tapCounts.has(key)) {
|
||||
let count = this.tapCounts.get(key)
|
||||
this.tapCounts.set(key, count+1)
|
||||
this.tapCounts.set(key, count + 1)
|
||||
}
|
||||
else {
|
||||
this.tapCounts.set(key, 1)
|
||||
@ -413,7 +413,7 @@ export class Interaction extends InteractionPoints {
|
||||
}
|
||||
let result = false
|
||||
if (this.isTap(key)) {
|
||||
|
||||
|
||||
this.registerTap(key, ended)
|
||||
result = this.tapCounts.get(key) == 2
|
||||
}
|
||||
@ -554,7 +554,7 @@ export class InteractionDelegate {
|
||||
element.addEventListener(
|
||||
'pointerup',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerup')
|
||||
if (this.debug) console.log('pointerup', e.pointerId, e.pointerType)
|
||||
this.onEnd(e)
|
||||
if (this.capturePointerEvents) {
|
||||
try {
|
||||
@ -567,7 +567,7 @@ export class InteractionDelegate {
|
||||
element.addEventListener(
|
||||
'pointercancel',
|
||||
e => {
|
||||
if (this.debug) console.log('pointercancel')
|
||||
if (this.debug) console.log('pointercancel', e.pointerId, e.pointerType)
|
||||
this.onEnd(e)
|
||||
if (this.capturePointerEvents)
|
||||
element.releasePointerCapture(e.pointerId)
|
||||
@ -579,7 +579,7 @@ export class InteractionDelegate {
|
||||
element.addEventListener(
|
||||
'pointerleave',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerleave')
|
||||
if (this.debug) console.log('pointerleave', e.pointerId, e.pointerType)
|
||||
if (e.target == element) this.onEnd(e)
|
||||
},
|
||||
useCapture
|
||||
@ -590,7 +590,7 @@ export class InteractionDelegate {
|
||||
element.addEventListener(
|
||||
'pointerout',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerout')
|
||||
if (this.debug) console.log('pointerout', e.pointerId, e.pointerType)
|
||||
if (e.target == element) this.onEnd(e)
|
||||
},
|
||||
useCapture
|
||||
@ -601,8 +601,9 @@ export class InteractionDelegate {
|
||||
window.addEventListener(
|
||||
'pointerout',
|
||||
e => {
|
||||
if (this.debug) console.log('pointerout', e.pointerId, e.pointerType, e.target)
|
||||
if (e.target == element) {
|
||||
this.onEnd(e)
|
||||
this.onEnd(e)
|
||||
}
|
||||
},
|
||||
useCapture)
|
||||
|
Loading…
Reference in New Issue
Block a user