Changed calling order
This commit is contained in:
		
							parent
							
								
									e6f6f6b185
								
							
						
					
					
						commit
						54b685ab42
					
				
							
								
								
									
										13
									
								
								dist/iwmlib.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								dist/iwmlib.js
									
									
									
									
										vendored
									
									
								
							| @ -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() { | ||||
|  | ||||
							
								
								
									
										40
									
								
								dist/iwmlib.pixi.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								dist/iwmlib.pixi.js
									
									
									
									
										vendored
									
									
								
							| @ -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 | ||||
|         } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user