git.iko.soy/elk
on master help sign in
Convert the random and touch modules to the new format.
commitccf9917f2ebb25389c78e92714ee59db5a7fd887 authorevancz <info@elm-lang.org> dateFri 8 Mar 2013, 22:57 (14 years ago) parentf70fdaa
2 files changed+27−25
compare with master
unifiedsplit
libraries/Native/Signal/Random.js+13−12 libraries/Native/Signal/Touch.js+14−13
libraries/Native/Signal/Random.js+13−12
@@ -1,20 +1,21 @@
11
2−/*
3−import Signal
4−*/
5−
6−(function() {
2+Elm.Native.Random = function(elm) {
73 'use strict';
4+ elm.Native = elm.Native || {};
5+ if (elm.Native.Random) return elm.Native.Random;
86
9− function inRange(min, max) {
10− return Elm.Signal.constant(Math.floor(Math.random() * (max-min+1)) + min);
11− }
7+ var Signal = Elm.Signal(elm);
128
13− function randomize(min, max, signal) {
9+ function range(min, max, signal) {
1410 function f(x) { return Math.floor(Math.random() * (max-min+1)) + min; }
15− return Elm.Signal.lift(f)(signal);
11+ return A2( Signal.lift, f, signal );
12+ }
13+
14+ function float(signal) {
15+ function f(x) { return Math.random() }
16+ return A2( Signal.lift, f, signal );
1617 }
1718
18− Elm.Native.Random = { inRange:F2(inRange), randomize: F3(randomize) };
19+ return elm.Native.Random = { range: F3(randomize), float: float };
1920
20−}());
21+};
libraries/Native/Signal/Touch.js+14−13
@@ -1,11 +1,13 @@
1−/*
2−import Signal
3−import JavaScript
4−*/
51
6−(function() {
2+Elm.Native.Touch = function(elm) {
73 'use strict';
84
5+ elm.Native = elm.Native || {};
6+ if (elm.Native.Touch) return elm.Native.Touch;
7+
8+ var Signal = Elm.Signal(elm);
9+ var JS = Elm.JavaScript(elm);
10+
911 function Dict() {
1012 this.keys = [];
1113 this.values = [];
@@ -28,7 +30,7 @@ import JavaScript
2830 };
2931 }
3032
31− var root = Elm.Signal.constant([]),
33+ var root = Signal.constant([]),
3234 tapTime = 500,
3335 hasTap = false,
3436 tap = {_:{},x:0,y:0},
@@ -76,24 +78,23 @@ import JavaScript
7678 listen("touchleave", end);
7779
7880 function dependency(f) {
79− var sig = Elm.Signal.lift(f)(root);
81+ var sig = A2( Signal.lift, f, root );
8082 root.defaultNumberOfKids += 1;
8183 sig.defaultNumberOfKids = 0;
8284 return sig;
8385 }
8486
85− var touches = dependency(function(ts) {
86− return Elm.JavaScript.castJSArrayToList(ts);
87− });
87+ var touches = dependency(JS.fromList);
8888
8989 var taps = function() {
9090 var sig = dependency(function(_) { return tap; });
9191 sig.defaultNumberOfKids = 1;
9292 function pred(_) { var b = hasTap; hasTap = false; return b; }
93− var sig2 = Elm.Signal.keepIf(pred)({_:{},x:0,y:0})(sig);
93+ var sig2 = A3( Signal.keepIf, pred, {_:{},x:0,y:0}, sig);
9494 sig2.defaultNumberOfKids = 0;
9595 return sig2;
9696 }();
9797
98− Elm.Native.Touch = { touches: touches, taps: taps };
99−}());
98+ return elm.Native.Touch = { touches: touches, taps: taps };
99+
100+};