Skip to content

Commit 54ae879

Browse files
committed
update distribution
1 parent a33cfd6 commit 54ae879

File tree

4 files changed

+339
-224
lines changed

4 files changed

+339
-224
lines changed

dist/worker-event-dispatcher.js

Lines changed: 47 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,17 @@
147147
* @constructor
148148
*/
149149
function WorkerMessenger(port, receiverEventPreprocessor, senderEventPreprocessor) {
150-
150+
if (port === NOINIT) return;
151151
function postMessageHandler(data, transferList) {
152152
port.postMessage(data, transferList);
153153
}
154154

155155
MessagePortDispatcher.call(this, port, postMessageHandler, receiverEventPreprocessor, senderEventPreprocessor);
156156
}
157157

158+
WorkerMessenger.prototype = MessagePortDispatcher.createNoInitPrototype();
159+
WorkerMessenger.prototype.constructor = WorkerMessenger;
160+
158161
function setScopeHandlers(source, target) {
159162
WorkerEvent.createHandler(Event.ERROR, source, target);
160163
WorkerEvent.createHandler(Event.LANGUAGECHANGE, source, target);
@@ -167,11 +170,45 @@
167170
function setAbstractWorkerHandlers(source, target) {
168171
WorkerEvent.createHandler(Event.ERROR, source, target);
169172
}
173+
function createNoInitPrototype() {
174+
return new WorkerMessenger(NOINIT);
175+
}
176+
177+
WorkerMessenger.createNoInitPrototype = createNoInitPrototype;
170178

171179
WorkerMessenger.setAbstractWorkerHandlers = setAbstractWorkerHandlers;
172180
return WorkerMessenger;
173181
})();
174182

183+
/**
184+
*
185+
* @param worker {String|Worker}
186+
* @param type {String}
187+
* @param receiverEventPreprocessor {?Function}
188+
* @param senderEventPreprocessor {?Function}
189+
* @extends WorkerMessenger
190+
* @constructor
191+
*/
192+
function WorkerEventDispatcher(worker, receiverEventPreprocessor, senderEventPreprocessor, type) {
193+
if (worker === NOINIT) {
194+
Object.defineProperties(this, {
195+
type: {
196+
value: type
197+
}
198+
});
199+
} else {
200+
Object.defineProperties(this, {
201+
type: {
202+
value: WorkerType.DEDICATED_WORKER
203+
}
204+
});
205+
DedicatedWorkerEventDispatcher.call(this, worker, receiverEventPreprocessor, senderEventPreprocessor);
206+
}
207+
}
208+
209+
WorkerEventDispatcher.prototype = WorkerMessenger.createNoInitPrototype();
210+
WorkerEventDispatcher.prototype.constructor = WorkerEventDispatcher;
211+
175212
/**
176213
*
177214
* @param worker
@@ -196,10 +233,10 @@
196233

197234
_target.addEventListener('connect', connectHandler);
198235

199-
this.addEventListener = _receiver.addEventListener;
200-
this.hasEventListener = _receiver.hasEventListener;
201-
this.removeEventListener = _receiver.removeEventListener;
202-
this.removeAllEventListeners = _receiver.removeAllEventListeners;
236+
this.addEventListener = _receiver.addEventListener.bind(_receiver);
237+
this.hasEventListener = _receiver.hasEventListener.bind(_receiver);
238+
this.removeEventListener = _receiver.removeEventListener.bind(_receiver);
239+
this.removeAllEventListeners = _receiver.removeAllEventListeners.bind(_receiver);
203240

204241
WorkerMessenger.setScopeHandlers(_target, _receiver);
205242

@@ -209,10 +246,14 @@
209246
},
210247
target: {
211248
value: _target
249+
},
250+
type: {
251+
value: WorkerType.SHARED_WORKER_SERVER
212252
}
213253
});
214254
}
215-
ServerEventDispatcher.prototype = new WorkerEventDispatcher(NOINIT, null, null, WorkerType.SHARED_WORKER_SERVER);
255+
256+
ServerEventDispatcher.prototype = EventDispatcher.createNoInitPrototype();
216257
ServerEventDispatcher.prototype.constructor = ServerEventDispatcher;
217258

218259
/**
@@ -287,27 +328,6 @@
287328
DedicatedWorkerEventDispatcher.prototype = new WorkerEventDispatcher(NOINIT, null, null, WorkerType.DEDICATED_WORKER);
288329
DedicatedWorkerEventDispatcher.prototype.constructor = DedicatedWorkerEventDispatcher;
289330

290-
/**
291-
*
292-
* @param worker {String|Worker}
293-
* @param type {String}
294-
* @param receiverEventPreprocessor {?Function}
295-
* @param senderEventPreprocessor {?Function}
296-
* @extends WorkerMessenger
297-
* @constructor
298-
*/
299-
function WorkerEventDispatcher(worker, receiverEventPreprocessor, senderEventPreprocessor, type) {
300-
if (worker === NOINIT) {
301-
Object.defineProperties(this, {
302-
type: {
303-
value: type
304-
}
305-
});
306-
} else {
307-
DedicatedWorkerEventDispatcher.call(this, worker, receiverEventPreprocessor, senderEventPreprocessor);
308-
}
309-
}
310-
311331
WorkerEventDispatcher.WorkerEvent = WorkerEvent;
312332
WorkerEventDispatcher.WorkerType = WorkerType;
313333
WorkerEventDispatcher.CONNECT_EVENT = WorkerEvent.CONNECT;

dist/worker-event-dispatcher.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)