diff --git a/dist/iwmlib.js b/dist/iwmlib.js index 9ff449b..b54a9bb 100644 --- a/dist/iwmlib.js +++ b/dist/iwmlib.js @@ -614,6 +614,19 @@ static toLine(event) { return `${event.type} #${event.target.id} ${event.clientX} ${event.clientY}` + let result = event.type; + let selector = this.selector(event.target); + result += ' selector: ' + selector; + if (event.target != document.querySelector(selector)) console.log('Cannot resolve', selector); + let keys = ['layerX', 'layerY', 'pageX', 'pageY', 'clientX', 'clientY']; + for (let key of keys) { + try { + result += ' ' + key + ':' + event[key]; + } catch (e) { + console.log('Invalid key: ' + key); + } + } + return result } static compareExtractedWithSimulated() { diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index ccff9ab..950aa8f 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -1335,6 +1335,19 @@ static toLine(event) { return `${event.type} #${event.target.id} ${event.clientX} ${event.clientY}` + let result = event.type; + let selector = this.selector(event.target); + result += ' selector: ' + selector; + if (event.target != document.querySelector(selector)) console.log('Cannot resolve', selector); + let keys = ['layerX', 'layerY', 'pageX', 'pageY', 'clientX', 'clientY']; + for (let key of keys) { + try { + result += ' ' + key + ':' + event[key]; + } catch (e) { + console.log('Invalid key: ' + key); + } + } + return result } static compareExtractedWithSimulated() { @@ -2509,10 +2522,6 @@ this.opts.beforeAction.call(this, e, this); } - if (this.opts.action) { - this.opts.action.call(this, e, this); - } - TweenLite.to([this.button, this.content], this.theme.fast, { alpha: 0.83, overwrite: 'none' @@ -2522,6 +2531,10 @@ this.active = !this.active; } + if (this.opts.action) { + this.opts.action.call(this, e, this); + } + if (this.opts.afterAction) { this.opts.afterAction.call(this, e, this); } @@ -6174,6 +6187,25 @@ result[id] = this.getPosition(event); break } + // case 'TouchEvent': + // // Needs to be observed: Perhaps changedTouches are all we need. If so + // // we can remove the touchEventKey default parameter + // if (touchEventKey == 'all') { + // for(let t of event.targetTouches) { + // result[t.identifier.toString()] = this.getPosition(t) + // } + // for(let t of event.changedTouches) { + // result[t.identifier.toString()] = this.getPosition(t) + // } + // } + // else { + // for(let t of event.changedTouches) { + // result[t.identifier.toString()] = this.getPosition(t) + // } + // } + // break + default: + break } return result }