7f31484 · elk · git.iko.soy

git.iko.soy/elk

Fix a cyclical dependency in the runtime, fix a use of `ms` which is now undefined.

commit7f314846ad8e218a05ecf2566c2b46475eb51aa0 authorevancz <info@elm-lang.org> dateMon 20 May 2013, 15:36 (13 years ago) parent94bb5e5

3 files changed+8−8

compare with master

unifiedsplit

libraries/Native/JavaScript.js+3−3 libraries/Time.elm+1−1 runtime/Render/Utils.js+4−4

libraries/Native/JavaScript.js+3−3

@@ -84,10 +84,10 @@ Elm.Native.JavaScript = function(elm) {

8484 return elm.Native.JavaScript = {

8585 toFloat : id,

8686 toBool : id,

87− toInt : function(n) { return n|0 },

88− toString : function(s) { return List.fromArray(s) },

87+ toInt : function(n) { return n|0; },

88+ toString : List.fromArray,

8989 toList : List.fromArray,

90− fromString : function(s) { return List.toArray(s).join('') },

90+ fromString : function(s) { return List.toArray(s).join(''); },

9191 fromList : List.toArray,

9292 fromInt : id,

9393 fromFloat : id,

libraries/Time.elm+1−1

@@ -14,7 +14,7 @@ millisecond : Time

1414millisecond = 1

1515

1616second : Time

17−second = 1000 * ms

17+second = 1000 * millisecond

1818

1919minute : Time

2020minute = 60 * second

runtime/Render/Utils.js+4−4

@@ -34,14 +34,14 @@ function removeTransform(style) {

3434 style.OTransform = 'none';

3535}

3636

37−var JS = Elm.JavaScript({});

37+var List = Elm.Native.List({});

3838

3939return {addTo:addTo,

4040 newElement:newElement,

4141 extract : extract,

42− fromList: JS.fromList,

43− fromString: JS.fromString,

44− toString: JS.toString,

42+ fromList: List.toArray,

43+ fromString: function(s) { return List.toArray(s).join(''); },

44+ toString: List.fromArray,

4545 eq: Elm.Native.Utils({}).eq,

4646 addTransform: addTransform,

4747 removeTransform: removeTransform