update for new version of messageport-dispatcher

Author: burdiuz

source/worker-event-dispatcher.js

@@ -125,14 +125,17 @@ var WorkerMessenger = (function() {
    * @constructor
    */
   function WorkerMessenger(port, receiverEventPreprocessor, senderEventPreprocessor) {
-
+    if (port === NOINIT) return;
     function postMessageHandler(data, transferList) {
       port.postMessage(data, transferList);
     }
 
     MessagePortDispatcher.call(this, port, postMessageHandler, receiverEventPreprocessor, senderEventPreprocessor);
   }
 
+  WorkerMessenger.prototype = MessagePortDispatcher.createNoInitPrototype();
+  WorkerMessenger.prototype.constructor = WorkerMessenger;
+
   function setScopeHandlers(source, target) {
     WorkerEvent.createHandler(Event.ERROR, source, target);
     WorkerEvent.createHandler(Event.LANGUAGECHANGE, source, target);
@@ -145,11 +148,45 @@ var WorkerMessenger = (function() {
   function setAbstractWorkerHandlers(source, target) {
     WorkerEvent.createHandler(Event.ERROR, source, target);
   }
+  function createNoInitPrototype() {
+    return new WorkerMessenger(NOINIT);
+  }
+
+  WorkerMessenger.createNoInitPrototype = createNoInitPrototype;
 
   WorkerMessenger.setAbstractWorkerHandlers = setAbstractWorkerHandlers;
   return WorkerMessenger;
 })();
 
+/**
+ *
+ * @param worker {String|Worker}
+ * @param type {String}
+ * @param receiverEventPreprocessor {?Function}
+ * @param senderEventPreprocessor {?Function}
+ * @extends WorkerMessenger
+ * @constructor
+ */
+function WorkerEventDispatcher(worker, receiverEventPreprocessor, senderEventPreprocessor, type) {
+  if (worker === NOINIT) {
+    Object.defineProperties(this, {
+      type: {
+        value: type
+      }
+    });
+  } else {
+    Object.defineProperties(this, {
+      type: {
+        value: WorkerType.DEDICATED_WORKER
+      }
+    });
+    DedicatedWorkerEventDispatcher.call(this, worker, receiverEventPreprocessor, senderEventPreprocessor);
+  }
+}
+
+WorkerEventDispatcher.prototype = WorkerMessenger.createNoInitPrototype();
+WorkerEventDispatcher.prototype.constructor = WorkerEventDispatcher;
+
 /**
  *
  * @param worker
@@ -174,10 +211,10 @@ function ServerEventDispatcher(target, receiverEventPreprocessor) {
 
   _target.addEventListener('connect', connectHandler);
 
-  this.addEventListener = _receiver.addEventListener;
-  this.hasEventListener = _receiver.hasEventListener;
-  this.removeEventListener = _receiver.removeEventListener;
-  this.removeAllEventListeners = _receiver.removeAllEventListeners;
+  this.addEventListener = _receiver.addEventListener.bind(_receiver);
+  this.hasEventListener = _receiver.hasEventListener.bind(_receiver);
+  this.removeEventListener = _receiver.removeEventListener.bind(_receiver);
+  this.removeAllEventListeners = _receiver.removeAllEventListeners.bind(_receiver);
 
   WorkerMessenger.setScopeHandlers(_target, _receiver);
 
@@ -187,10 +224,14 @@ function ServerEventDispatcher(target, receiverEventPreprocessor) {
     },
     target: {
       value: _target
+    },
+    type: {
+      value: WorkerType.SHARED_WORKER_SERVER
     }
   });
 }
-ServerEventDispatcher.prototype = new WorkerEventDispatcher(NOINIT, null, null, WorkerType.SHARED_WORKER_SERVER);
+
+ServerEventDispatcher.prototype = EventDispatcher.createNoInitPrototype();
 ServerEventDispatcher.prototype.constructor = ServerEventDispatcher;
 
 /**
@@ -265,32 +306,6 @@ function DedicatedWorkerEventDispatcher(worker, receiverEventPreprocessor, sende
 DedicatedWorkerEventDispatcher.prototype = new WorkerEventDispatcher(NOINIT, null, null, WorkerType.DEDICATED_WORKER);
 DedicatedWorkerEventDispatcher.prototype.constructor = DedicatedWorkerEventDispatcher;
 
-/**
- *
- * @param worker {String|Worker}
- * @param type {String}
- * @param receiverEventPreprocessor {?Function}
- * @param senderEventPreprocessor {?Function}
- * @extends WorkerMessenger
- * @constructor
- */
-function WorkerEventDispatcher(worker, receiverEventPreprocessor, senderEventPreprocessor, type) {
-  if (worker === NOINIT) {
-    Object.defineProperties(this, {
-      type: {
-        value: type
-      }
-    });
-  } else {
-    Object.defineProperties(this, {
-      type: {
-        value: WorkerType.DEDICATED_WORKER
-      }
-    });
-    DedicatedWorkerEventDispatcher.call(this, worker, receiverEventPreprocessor, senderEventPreprocessor);
-  }
-}
-
 WorkerEventDispatcher.WorkerEvent = WorkerEvent;
 WorkerEventDispatcher.WorkerType = WorkerType;
 WorkerEventDispatcher.CONNECT_EVENT = WorkerEvent.CONNECT;

tests/server-eventdispatcher.spec.js

@@ -9,8 +9,8 @@ describe('ServerEventDispatcher', function() {
     worker = new MessagePortBase();
     dispatcher = new ServerEventDispatcher(worker);
   });
-  it('should extend WorkerEventDispatcher', function() {
-    expect(dispatcher).to.be.an.instanceof(WorkerEventDispatcher);
+  it('should extend EventDispatcher', function() {
+    expect(dispatcher).to.be.an.instanceof(EventDispatcher);
   });
   it('should add listeners to events', function() {
     expect(worker.addEventListener).to.be.calledWith(Event.ERROR);