9084db2 · elk · git.iko.soy

git.iko.soy/elk

Switch module structure to permit on-demand initialization and multiple runtimes working simultaneously.

commit9084db2b59550c958b49fcb6dd4b83fde0dcc8b0 authorevancz <info@elm-lang.org> dateFri 8 Mar 2013, 20:17 (14 years ago) parentf589cf3

3 files changed+82−76

compare with master

unifiedsplit

libraries/Native/Signal/HTTP.js → libraries/Native/Signal/Http.js+21−16 libraries/Native/Signal/Keyboard.js+13−9 libraries/Native/Signal/Mouse.js+48−51

libraries/Native/Signal/HTTP.js → libraries/Native/Signal/Http.jsrenamed+21−16

@@ -1,12 +1,16 @@

2−/*

2+/**

33import JavaScript

44import List

55import Signal

6−*/

6+**/

8−(function() {

8+Elm.Native.Signal.Http = function(elm) {

99 'use strict';

10+ elm.Native = elm.Native || {};

11+ elm.Native.Signal = elm.Native.Signal || {};

12+ if (elm.Native.Signal.Http) return elm.Native.Signal.Http;

13+

1014

1115 function registerReq(queue,responses) { return function(req) {

1216 if (req.url !== "") { sendReq(queue,responses,req); }

@@ -15,7 +19,7 @@ import Signal

1519

1620 function updateQueue(queue,responses) {

1721 if (queue.length > 0) {

18− Dispatcher.notify(responses.id, queue[0].value);

22+ elm.notify(responses.id, queue[0].value);

1923 if (queue[0].value.ctor !== Waiting) {

2024 queue.shift();

2125 setTimeout(function() { updateQueue(queue,responses); }, 0);

@@ -24,13 +28,13 @@ import Signal

2428 }

2529

2630 function setHeader(pair) {

27− request.setRequestHeader(Elm.JavaScript.castStringToJSString(pair._0),

28− Elm.JavaScript.castStringToJSString(pair._1));

31+ request.setRequestHeader(elm.JavaScript.fomString(pair._0),

32+ elm.JavaScript.fromString(pair._1));

2933 }

3034

3135 function sendReq(queue,responses,req) {

32− var JS = Elm.JavaScript;

33− var response = { value: Elm.HTTP.Waiting };

36+ var JS = elm.JavaScript;

37+ var response = { value: elm.Http.Waiting };

3438 queue.push(response);

3539

3640 var request = null;

@@ -39,24 +43,25 @@ import Signal

3943 request.onreadystatechange = function(e) {

4044 if (request.readyState === 4) {

4145 response.value = (request.status === 200

42− ? Elm.HTTP.Success(JS.castJSStringToString(request.responseText))

43− : Elm.HTTP.Failure(request.status)(JS.castJSStringToString(request.statusText)));

46+ ? elm.Http.Success(JS.castJSStringToString(request.responseText))

47+ : elm.Http.Failure(request.status)(JS.castJSStringToString(request.statusText)));

4448 setTimeout(function() { updateQueue(queue,responses); }, 0);

4549 }

4650 };

4751 request.open(JS.castStringToJSString(req.verb),

4852 JS.castStringToJSString(req.url),

4953 true);

50− Elm.List.map(setHeader)(req.headers);

54+ elm.List.map(setHeader)(req.headers);

5155 request.send(JS.castStringToJSString(req.body));

5256 }

5357

5458 function send(requests) {

55− var responses = Elm.Signal.constant(Elm.HTTP.Waiting);

56− var sender = Elm.Signal.lift(registerReq([],responses))(requests);

59+ var responses = elm.Signal.constant(elm.Http.Waiting);

60+ var sender = elm.Signal.lift(registerReq([],responses))(requests);

5761 function f(x) { return function(y) { return x; } }

58− return Elm.Signal.lift2(f)(responses)(sender);

62+ return elm.Signal.lift2(f)(responses)(sender);

5963 }

6064

61− Elm.Native.HTTP = {send:send};

62−}());

65+ return elm.Native.Signal.Http = {send:send};

66+

67+};

libraries/Native/Signal/Keyboard.js+13−9

@@ -1,15 +1,19 @@

11/*

2−import Signal

3−import Keyboard.Raw

4−import List

52*/

7−(function() {

4+Elm.Native.Signal.Keyboard = function(elm) {

85 'use strict';

6+ elm.Native = elm.Native || {};

7+ elm.Native.Signal = elm.Native.Signal || {};

8+ if (elm.Native.Signal.Keyboard) return elm.Native.Signal.Keyboard;

10+ var Signal = Elm.Signal(elm);

11+ var KR = Elm.Keyboard.Raw(elm);

12+ var List = Elm.List(elm);

913

1014 function keySignal(f) {

11− var signal = Elm.Signal.lift(f)(Elm.Keyboard.Raw.keysDown);

12− Elm.Keyboard.Raw.keysDown.defaultNumberOfKids += 1;

15+ var signal = Signal.lift(f)(elm.Keyboard.Raw.keysDown);

16+ KR.keysDown.defaultNumberOfKids += 1;

1317 signal.defaultNumberOfKids = 0;

1418 return signal;

1519 }

@@ -31,8 +35,8 @@ import List

3135 return keySignal(f);

3236 }

3337

34− function is(key) { return keySignal(Elm.List.member(key)); }

38+ function is(key) { return keySignal(List.member(key)); }

3539

36− Elm.Native.Keyboard = { isDown:is, dir:F4(dir) };

40+ return elm.Native.Signal.Keyboard = { isDown:is, dir:F4(dir) };

3741

38−}());

42+};

libraries/Native/Signal/Mouse.js+48−51

@@ -1,27 +1,27 @@

1−/*

2−import Signal

3−import Native.Misc

4−*/

6−(function() {

2+Elm.Native.Signal.Mouse = function(elm) {

73 'use strict';

4+ elm.Native = elm.Native || {};

5+ elm.Native.Signal = elm.Native.Signal || {};

6+ if (elm.Native.Signal.Mouse) return elm.Native.Signal.Mouse;

9− var Misc = Elm.Native.Misc;

8+ var Signal = Elm.Signal(elm);

9+ var Misc = Elm.Native.Misc(elm);

1010

11− var position = Elm.Signal.constant(Misc.Tuple(0,0));

11+ var position = Signal.constant(Misc.Tuple(0,0));

1212 position.defaultNumberOfKids = 2;

1313

1414 // do not get rid of x and y. By setting their default number

1515 // of kids, it is possible to detatch the mouse listeners if

1616 // they are not needed.

17− var x = Elm.Signal.lift(function(p){return p._0})(position);

17+ var x = Signal.lift(function(p){return p._0})(position);

1818 x.defaultNumberOfKids = 0;

19− var y = Elm.Signal.lift(function(p){return p._1})(position);

19+ var y = Signal.lift(function(p){return p._1})(position);

2020 y.defaultNumberOfKids = 0;

2121

22− var isDown = Elm.Signal.constant(false);

23− var isClicked = Elm.Signal.constant(false);

24− var clicks = Elm.Signal.constant(Misc.Tuple());

22+ var isDown = Signal.constant(false);

23+ var isClicked = Signal.constant(false);

24+ var clicks = Signal.constant(Misc.Tuple0);

2525

2626 function getXY(e) {

2727 var posx = 0;

@@ -36,46 +36,43 @@ import Native.Misc

3636 posy = e.clientY + document.body.scrollTop +

3737 document.documentElement.scrollTop;

3838 }

39− return Misc.Tuple(posx, posy);

39+ return Misc.Tuple2(posx, posy);

4040 }

4141

42− Misc.addListener(document, 'click', function(e) {

43− var hasListener1 = Dispatcher.notify(isClicked.id, true);

44− var hasListener2 = Dispatcher.notify(clicks.id, Misc.Tuple());

45− Dispatcher.notify(isClicked.id, false);

46− if (!hasListener1 && !hasListener2)

47− this.removeEventListener('click',arguments.callee,false);

48− });

49− Misc.addListener(document, 'mousedown', function(e) {

50− var hasListener = Dispatcher.notify(isDown.id, true);

51− if (!hasListener)

52− this.removeEventListener('mousedown',arguments.callee,false);

53− });

54− Misc.addListener(document, 'mouseup', function(e) {

55− var hasListener = Dispatcher.notify(isDown.id, false);

56− if (!hasListener)

57− this.removeEventListener('mouseup',arguments.callee,false);

58− });

59− Misc.addListener(document, 'mousemove', function(e) {

60− var hasListener = Dispatcher.notify(position.id, getXY(e));

61− if (!hasListener)

62− this.removeEventListener('mousemove',arguments.callee,false);

63− });

42+ function click(e) {

43+ var hasListener1 = elm.notify(isClicked.id, true);

44+ var hasListener2 = elm.notify(clicks.id, Misc.Tuple0);

45+ elm.notify(isClicked.id, false);

46+ if (!hasListener1 && !hasListener2)

47+ this.removeEventListener('click',arguments.callee,false);

48+ }

49+

50+ function down(e) {

51+ var hasListener = elm.notify(isDown.id, true);

52+ if (!hasListener) this.removeEventListener('mousedown',arguments.callee,false);

53+ }

54+

55+ function up(e) {

56+ var hasListener = elm.notify(isDown.id, false);

57+ if (!hasListener) this.removeEventListener('mouseup',arguments.callee,false);

58+ }

59+

60+ function move(e) {

61+ var hasListener = elm.notify(position.id, getXY(e));

62+ if (!hasListener) this.removeEventListener('mousemove',arguments.callee,false);

63+ }

64+

65+ Misc.addListener(elm.node, 'click' , click);

66+ Misc.addListener(elm.node, 'mousedown', down);

67+ Misc.addListener(elm.node, 'mouseup' , up);

68+ Misc.addListener(elm.node, 'mousemove', move);

6469

65− var clickedOn = function(elem) {

66− var node = Render.render(elem);

67− var click = Elm.Signal.constant(false);

68− Misc.addListener(node, 'click', function(e) {

69− Dispatcher.notify(click.id, true);

70− Dispatcher.notify(click.id, false);

71− });

72− return Misc.Tuple(Misc.wrap(node), click);

70+ return elm.Native.Signal.Mouse = {

71+ position: position,

72+ x:x,

73+ y:y,

74+ isClicked: isClicked,

75+ isDown: isDown,

76+ clicks: clicks

7377 };

74− Elm.Native.Mouse = {position: position,

75− x:x,

76− y:y,

77− isClicked: isClicked,

78− isDown: isDown,

79− clicks: clicks,

80− isClickedOn: clickedOn};

81−}());

78+};