From f27db7c66e2b1739aae458dfe8ba04ec1d0cfdf3 Mon Sep 17 00:00:00 2001 From: Matt Walsh Date: Fri, 4 Sep 2020 14:10:26 -0500 Subject: [PATCH] remove need for time worker --- server/scripts/TimerWorker.js | 66 ------------------------ server/scripts/timer.js | 94 ----------------------------------- views/index.ejs | 2 - 3 files changed, 162 deletions(-) delete mode 100644 server/scripts/TimerWorker.js delete mode 100644 server/scripts/timer.js diff --git a/server/scripts/TimerWorker.js b/server/scripts/TimerWorker.js deleted file mode 100644 index b8f0080..0000000 --- a/server/scripts/TimerWorker.js +++ /dev/null @@ -1,66 +0,0 @@ -var _TimerInfos = []; - -var TimerElasped = function (Id) -{ - var TimerInfo = _TimerInfos[Id]; - - if (!TimerInfo) - { - return; - } - - this.postMessage({ - Action: "ELASPED", - Id: TimerInfo.Id, - RunOnce: TimerInfo.RunOnce, - }); -}; - -this.onmessage = function (e) -{ - var Message = e.data; - - switch (Message.Action) - { - case "START": - var TimerInfo = { - Id: Message.Id, - RunOnce: Message.RunOnce, - TimeOut: Message.TimeOut, - }; - - _TimerInfos[Message.Id] = TimerInfo; - - if (Message.RunOnce == true) - { - TimerInfo.TimerId = setTimeout(TimerElasped, Message.TimeOut, Message.Id); - } - else - { - TimerInfo.TimerId = setInterval(TimerElasped, Message.TimeOut, Message.Id); - } - - break; - - case "STOP": - var TimerInfo = _TimerInfos[Message.Id]; - - if (!TimerInfo) - { - return; - } - - if (TimerInfo.RunOnce == true) - { - clearTimeout(TimerInfo.TimerId); - delete _TimerInfos[Message.Id]; - } - else - { - clearInterval(TimerInfo.TimerId); - delete _TimerInfos[Message.Id]; - } - - break; - } -} diff --git a/server/scripts/timer.js b/server/scripts/timer.js deleted file mode 100644 index e94f655..0000000 --- a/server/scripts/timer.js +++ /dev/null @@ -1,94 +0,0 @@ -if (window.Worker) -{ - var _TimerWorkCallBacks = []; - var _TimerIds = 0; - - var _TimerWorker = new window.Worker("scripts/TimerWorker.js"); - _TimerWorker.onmessage = function (e) - { - var Message = e.data; - - switch (Message.Action) - { - case "ELASPED": - var TimerWorkCallBack = _TimerWorkCallBacks[Message.Id]; - - if (!TimerWorkCallBack) - { - return; - } - - var Window = TimerWorkCallBack.Window; - var CallBack = TimerWorkCallBack.CallBack; - var Arguments = TimerWorkCallBack.Arguments; - - if (typeof (CallBack) === 'string') - { - CallBack = new Function(CallBack); - } - if (typeof (CallBack) === 'function') - { - CallBack.apply(Window, Arguments); - } - - if (Message.RunOnce == true) - { - _clearIntervalWorker(Message.Id); - } - break; - } - }; - - window.setIntervalWorker = function (CallBack, TimeOut, Arguments) - { - Arguments = Array.prototype.slice.call(arguments).slice(2); - return _setIntervalWorker(false, CallBack, TimeOut, Arguments, window); - }; - window.setTimeoutWorker = function (CallBack, TimeOut, Arguments) - { - Arguments = Array.prototype.slice.call(arguments).slice(2); - return _setIntervalWorker(true, CallBack, TimeOut, Arguments, window); - }; - var _setIntervalWorker = function (RunOnce, CallBack, TimeOut, Arguments, Window) - { - var Id = ++_TimerIds; - - _TimerWorkCallBacks[Id] = { - CallBack: CallBack, - Arguments: Arguments, - Window: Window, - }; - - _TimerWorker.postMessage({ - Action: "START", - RunOnce: RunOnce, - Id: Id, - TimeOut: TimeOut, - }); - - return Id; - }; - - window.clearIntervalWorker = function (Id) - { - _clearIntervalWorker(Id); - }; - window.clearTimeoutWorker = function (Id) - { - _clearIntervalWorker(Id); - }; - var _clearIntervalWorker = function (Id) - { - if (!Id) - { - return; - } - - _TimerWorker.postMessage({ - Action: "STOP", - Id: Id, - }); - - delete _TimerWorkCallBacks[Id]; - }; -} diff --git a/views/index.ejs b/views/index.ejs index 0b003c1..588e0fd 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -30,7 +30,6 @@ - <% } else { %> @@ -39,7 +38,6 @@ - <% } %>