924ed91 · elk · git.iko.soy

git.iko.soy/elk

Properly define setTimeout for normal use

Also renames runDelayed => setTimeout to make things clearer

commit924ed91a615406839fa4f3bfd14d0122b8314065 authorEvan Czaplicki <info@elm-lang.org> dateThu 14 Aug 2014, 19:20 (12 years ago) parent78b65d9

3 files changed+8−4

compare with master

unifiedsplit

libraries/Native/Signal/Time.js+3−3 runtime/Debugger.js+1−1 runtime/Init.js+4

libraries/Native/Signal/Time.js+3−3

@@ -28,7 +28,7 @@ Elm.Native.Time.make = function(elm) {

2828 var timeoutID = 0;

2929 function f(isOn, t) {

3030 if (isOn) {

31− timeoutID = elm.runDelayed(tick(!wasOn && isOn), msPerFrame);

31+ timeoutID = elm.setTimeout(tick(!wasOn && isOn), msPerFrame);

3232 } else if (wasOn) {

3333 clearTimeout(timeoutID);

3434 }

@@ -42,9 +42,9 @@ Elm.Native.Time.make = function(elm) {

4242 var clock = NS.input(elm.timer.now());

4343 function tellTime() {

4444 elm.notify(clock.id, elm.timer.now());

45− elm.runDelayed(tellTime, t);

45+ elm.setTimeout(tellTime, t);

4646 }

47− elm.runDelayed(tellTime, t);

47+ elm.setTimeout(tellTime, t);

4848 return clock;

4949 }

5050

runtime/Debugger.js+1−1

@@ -41,7 +41,7 @@ function debugModule(module, runtime) {

4141 // so we can access all runtime properties too

4242 var wrappedRuntime = Object.create(runtime);

4343 wrappedRuntime.notify = notifyWrapper;

44− wrappedRuntime.runDelayed = setTimeoutWrapper;

44+ wrappedRuntime.setTimeout = setTimeoutWrapper;

4545

4646 // make a copy of the wrappedRuntime

4747 var assignedPropTracker = Object.create(wrappedRuntime);

runtime/Init.js+4

@@ -69,6 +69,9 @@ function init(display, container, module, ports, moduleToReplace) {

6969 }

7070 updateInProgress = false;

7171 }

72+ function setTimeout(func, delay) {

73+ window.setTimeout(func, delay);

74+ }

7275

7376 var listeners = [];

7477 function addListener(relevantInputs, domNode, eventName, func) {

@@ -90,6 +93,7 @@ function init(display, container, module, ports, moduleToReplace) {

9093 // object. This permits many Elm programs to be embedded per document.

9194 var elm = {

9295 notify:notify,

96+ setTimeout:setTimeout,

9397 node:container,

9498 display:display,

9599 id:ElmRuntime.guid(),