From c77e9d5a11c5f47bc0de5e83c97ce1909ea41e9b Mon Sep 17 00:00:00 2001
From: Jason Mulligan <jason.mulligan@avoidwork.com>
Date: Wed, 15 Jun 2016 19:28:13 -0400
Subject: [PATCH] Changing the order of execution & updating test, fixes #2
---
LICENSE | 2 +-
README.md | 2 +-
lib/worker.js | 4 ++--
package.json | 2 +-
src/worker.js | 4 ++--
test/worker_repeater.js | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/LICENSE b/LICENSE
index 2073a58..2f9316f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015, Jason Mulligan
+Copyright (c) 2016, Jason Mulligan
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 8aed1e5..c4f0171 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Tiny WebWorker for Server
#### Creating a Worker from a file
The worker script:
```javascript
-self.onmessage = function (ev) {
+onmessage = function (ev) {
postMessage(ev.data);
};
```
diff --git a/lib/worker.js b/lib/worker.js
index 3c7576a..b575e2d 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -67,11 +67,11 @@ process.once("message", function (obj) {
});
process.on("message", function (msg) {
- (global.self.onmessage || global.onmessage || noop)(JSON.parse(msg));
+ (global.onmessage || global.self.onmessage || noop)(JSON.parse(msg));
});
process.on("error", function (err) {
- (global.self.onerror || global.onerror || noop)(err);
+ (global.onerror || global.self.onerror || noop)(err);
});
if (typeof exp === "function") {
diff --git a/package.json b/package.json
index 939f16d..b746ff0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "tiny-worker",
- "version": "1.1.1",
+ "version": "1.1.2",
"description": "Tiny WebWorker for Server",
"main": "lib/index.js",
"scripts": {
diff --git a/src/worker.js b/src/worker.js
index b3bfb67..a87a39a 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -61,11 +61,11 @@ process.once("message", function (obj) {
});
process.on("message", function (msg) {
- (global.self.onmessage || global.onmessage || noop)(JSON.parse(msg));
+ (global.onmessage || global.self.onmessage || noop)(JSON.parse(msg));
});
process.on("error", function (err) {
- (global.self.onerror || global.onerror || noop)(err);
+ (global.onerror || global.self.onerror || noop)(err);
});
if (typeof exp === "function") {
diff --git a/test/worker_repeater.js b/test/worker_repeater.js
index 75eb464..13cc508 100644
--- a/test/worker_repeater.js
+++ b/test/worker_repeater.js
@@ -1,3 +1,3 @@
-self.onmessage = function (ev) {
+onmessage = function (ev) {
postMessage(ev.data);
};
\ No newline at end of file
--
GitLab