pixi-hammer
Advanced tools
Comparing version 0.2.0 to 0.3.0
@@ -35,2 +35,8 @@ var PIXI = require('pixi.js'); | ||
c.listen(rect2, 'double-tap', { | ||
taps: 2 | ||
}, function(e) { | ||
console.log('double tap on the rect2!'); | ||
}); | ||
c.listen(rect, 'tap', function(e) { | ||
@@ -44,2 +50,3 @@ console.log('tapping on the rect1!'); | ||
c.start(); | ||
c.setDependency('recognizeWith', 'tap', 'double-tap'); | ||
c.setDependency('requireFailure', 'tap', 'double-tap'); |
65
index.js
@@ -28,7 +28,4 @@ var Hammer = require('hammerjs'); | ||
// listeners with a pair of key(instance's name) and | ||
self._listeners = {}; | ||
self._options = {}; | ||
self._dependencies = []; | ||
self._isStart = false; | ||
@@ -46,3 +43,3 @@ // hammer manager | ||
self._handler = function(e) { | ||
Connector.normalizePointer(e, self._offset.x, self._offset.y); | ||
self.normalizePointer(e, self._offset.x, self._offset.y); | ||
// sugar sub method to ending propagations | ||
@@ -129,3 +126,3 @@ e.end = self._mc.stop.bind(self._mc, true); | ||
// for event added after `start` and dint have reusable recognizer | ||
if (self._isStart && event !== 'hammer.input' && !self._mc.get(event)) { | ||
if (event !== 'hammer.input' && !self._mc.get(event)) { | ||
if (self.isCustomEvent(event)) { | ||
@@ -138,10 +135,2 @@ self.createCustomRecognizer(event); | ||
self._mc.on(event, self._handler); | ||
// run related dependencies stack again | ||
self._dependencies | ||
.filter(function(dep) { | ||
return dep.includes(event); | ||
}) | ||
.forEach(function(dep) { | ||
self.setDependency.apply(self, dep); | ||
}); | ||
} | ||
@@ -162,37 +151,2 @@ } | ||
* @description | ||
* start binding event listener | ||
*/ | ||
Connector.prototype.start = function() { | ||
var self = this; | ||
self._isStart = true; | ||
var temp = []; | ||
for (var key in self._listeners) { | ||
if (self.isCustomEvent(key)) { | ||
// initialize custom recognizers | ||
var customName = self.getCustomName(key); | ||
if (!temp.includes(customName)) { | ||
temp.push(customName); | ||
self.createCustomRecognizer(key); | ||
} | ||
} else { | ||
// initialize normal recognizers | ||
var type = self.getRecognizerType(key); | ||
self.createRecognizer(type); | ||
} | ||
} | ||
// run the dependecies stack | ||
self._dependencies.forEach(function(dep) { | ||
self.setDependency.apply(self, dep); | ||
}); | ||
for (var key in self._listeners) { | ||
// listen to events | ||
self._mc.on(key, self._handler); | ||
} | ||
}; | ||
/** | ||
* @description | ||
* wrapper to call `recognizeWith|requireFailure` methods of `target` base on `baseTarget` | ||
@@ -206,10 +160,7 @@ * cache and run if this is called before `this.start` | ||
var self = this; | ||
if (self._isStart) { | ||
var t = self._mc.get(target); | ||
var b = self._mc.get(baseTarget); | ||
// skip silently if recognizer is not found | ||
t && b && t[method](b); | ||
} else { | ||
self._dependencies.push([method, target, baseTarget]); | ||
} | ||
var t = self._mc.get(target); | ||
var b = self._mc.get(baseTarget); | ||
// skip silently if recognizer is not found | ||
t && b && t[method](b); | ||
}; | ||
@@ -333,3 +284,3 @@ | ||
*/ | ||
Connector.normalizePointer = function(e, offsetX, offsetY) { | ||
Connector.prototype.normalizePointer = function(e, offsetX, offsetY) { | ||
e.center.x = (e.center.x - offsetX || 0); | ||
@@ -336,0 +287,0 @@ e.center.y = (e.center.y - offsetY || 0); |
{ | ||
"name": "pixi-hammer", | ||
"version": "0.2.0", | ||
"version": "0.3.0", | ||
"description": "Use Hammerjs with pixi", | ||
@@ -5,0 +5,0 @@ "repository": "thammin/pixi-hammer", |
@@ -33,5 +33,2 @@ # pixi-hammer | ||
}); | ||
// start the Connector | ||
c.start(); | ||
``` | ||
@@ -46,3 +43,2 @@ | ||
- [ ] examples for `stopPropagation` etc | ||
- [ ] simplify API (adding listener on demand) | ||
@@ -49,0 +45,0 @@ ## License |
9810
287
45