Merge remote-tracking branch 'origin/fix-event-handling'

Author: Natalia Kowalczyk

lib/event-handler/index.js

@@ -1,14 +1,14 @@
-const makeMapListenersBag = require('./listeners-bag');
+const makeListenersBag = require('./listeners-bag');
 const makeCountingSet = require('./counting-set');
 
 module.exports = eventHandler;
 
 const mouseEvents = asMap(['mouseenter', 'mouseover', 'mouseleave']);
 
 function eventHandler(_m) {
-  const listenersBag = makeMapListenersBag();
-
+  const listenersBag = makeListenersBag();
   const activeTypes = makeCountingSet();
+  const holdFireSet = new Set();
 
   function on(type, listener) {
     if (listenersBag.add(type, listener)) {
@@ -59,22 +59,38 @@ function eventHandler(_m) {
     listenersBag.getListeners(type).forEach(listener => listener.call(_m, e));
   }
 
+  function fireEventUnlessHold(type, e) {
+    if (!holdFireSet.has(type)) {
+      fireEvent(type, e);
+    }
+  }
+
   function onmousemove(e) {
-    fireEvent('mousemove', e);
+    fireEventUnlessHold('mousemove', e);
   }
 
   function onmouseout(e) {
-    fireEvent('mouseout', e);
+    fireEventUnlessHold('mouseout', e);
   }
 
   function onevent(e) {
     const { type } = e;
-    fireEvent(type, e);
+    fireEventUnlessHold(type, e);
+  }
+
+  function holdFire(type, set) {
+    if (set) {
+      holdFireSet.add(type);
+    } else {
+      holdFireSet.delete(type);
+    }
   }
 
   return {
     on,
-    off
+    off,
+    fireEvent,
+    holdFire
   };
 }
 

lib/object.js

@@ -43,7 +43,7 @@ function ll(e) {
   }
 }
 
-function init(self, options) {
+function init(self) {
   let listeners = {};
 
   function on(event, fn) {
@@ -106,51 +106,10 @@ function init(self, options) {
     }
   }
 
-  function add(map) {
-    if (!self._m) {
-      self._m = map._m;
-      options.onadd(map);
-      self._eventHandler = map._eventHandler;
-      Object.keys(listeners).forEach(function (event) {
-        if (!drag[event]) {
-          listeners[event].forEach(function (listener) {
-            self._eventHandler.on(listener.event, listener.handler);
-          });
-        }
-      });
-    }
-    return self;
-  }
-
-  function remove() {
-    if (self._m) {
-      Object.keys(listeners).forEach(function (event) {
-        if (!drag[event]) {
-          listeners[event].forEach(function (listener) {
-            self._eventHandler.off(listener.event, listener.handler);
-          });
-        }
-      });
-      delete self._eventHandler;
-      options.onremove();
-      delete self._m;
-    }
-    return self;
-  }
-
   self.on = on;
   self.off = off;
   self.fire = fire;
   self.ll = self.ll || ll;
 
-  if (options) {
-    if (options.onadd) {
-      self.add = add;
-    }
-    if (options.onremove) {
-      self.remove = remove;
-    }
-  }
-
   return self;
 }