2c7fed1 · elk · git.iko.soy

git.iko.soy/elk

Ensure that standard JS objects `Date` and `JSON` do not get shadowed by the Elm libraries of the same name.

commit2c7fed1f2be17ef64d25f5f6d9326d048b6ca6e3 authorevancz <info@elm-lang.org> dateWed 21 Nov 2012, 18:47 (14 years ago) parentd2d456a

2 files changed+15−6

compare with master

unifiedsplit

core-js/Date.js+1−1 core-js/Signal/Time.js+14−5

core-js/Date.js+1−1

@@ -2,7 +2,7 @@

22Elm.Date = function() {

44 function readDate(str) {

5− var d = new Date(Elm.JavaScript.castStringToJSString(str));

5+ var d = new window.Date(Elm.JavaScript.castStringToJSString(str));

66 if (isNaN(d.getTime())) return ["Nothing"];

77 return ["Just",d];

88 }

core-js/Signal/Time.js+14−5

@@ -1,10 +1,18 @@

11Elm.Time = function() {

2+ function timeNow() { return (new window.Date).getTime(); }

23 var now = function(t) {

3− var clock = Elm.Signal.constant((new Date()).getTime());

4− function tellTime() { Dispatcher.notify(clock.id, (new Date()).getTime()); }

4+ var clock = Elm.Signal.constant(timeNow());

5+ function tellTime() { Dispatcher.notify(clock.id, timeNow()); }

56 setInterval(tellTime, t);

67 return clock;

78 };

9+ function fps(desiredFPS) {

10+ var msPerFrame = 1000 / desiredFPS;

11+ var ticker = Elm.Signal.constant(timeNow());

12+ function tick() { Dispatcher.notify(ticker.id, timeNow()); }

13+ function f(t) { setTimeout(tick, msPerFrame); return t; }

14+ return Elm.Signal.lift(f)(ticker);

15+ }

816 var every = function(t) {

917 t *= 1000;

1018 var clock = Elm.Signal.constant(0);

@@ -28,10 +36,11 @@ Elm.Time = function() {

2836 return thread;

2937 };

3038 function read(s) {

31− var t = Date.parse(s);

32− return isNaN(t) ? Nothing : Just(s);

39+ var t = window.Date.parse(s);

40+ return isNaN(t) ? ["Nothing"] : ["Just",t];

3341 }

3442 return {now:now,

43+ fps:fps,

3544 every:every,

3645 after:after,

3746 before:before,

@@ -43,7 +52,7 @@ Elm.Time = function() {

4352 inMinutes : function(t) { return ~~(t / 60000); },

4453 inSeconds : function(t) { return ~~(t / 1000); },

4554 inMillis : function(t) { return t; },

46− toDate : function(t) { return new Date(t); },

55+ toDate : function(t) { return new window.Date(t); },

4756 read : read

4857 };

4958