git.iko.soy/elk
on master help sign in
Tweaks to the last of the library code.
commitf903ff3fd8acaa4769bd9904ad3d1499d9f2588a authorevancz <info@elm-lang.org> dateSun 10 Mar 2013, 01:40 (14 years ago) parentb343564
5 files changed+18−15
compare with master
unifiedsplit
libraries/Graphics/Color.elm+7−4 libraries/Graphics/Element.elm+1−1 libraries/Json/Experimental.elm+6−6 libraries/Keyboard/Raw.elm−3 libraries/Native/Utils.js+4−1
libraries/Graphics/Color.elm+7−4
@@ -6,7 +6,8 @@ module Graphics.Color (rgba,rgb,hsva,hsv,
66 maroon,navy,green,
77 teal,purple,
88 violet,forestGreen,
9− black,white,gray,grey) where
9+ black,white,gray,grey,
10+ linear,radial) where
1011
1112import Native.Graphics.Color as C
1213
@@ -39,11 +40,13 @@ purple = Color 128 0 128 1
3940forestGreen = Color 34 139 34 1
4041violet = Color 238 130 238 1
4142
42−complement = C.complement
43−hsva = C.hsva
44−hsv = C.hsv
43+complement : Color -> Color
44+hsva : Int -> Float -> Float -> Float -> Color
45+hsv : Int -> Float -> Float -> Color
4546
4647data Gradient
4748 = Linear [(Float,Color)] (Float,Float) (Float,Float)
4849 | Radial [(Float,Color)] (Float,Float) Float (Float,Float) Float
4950
51+linear = Linear
52+radial = Radial
libraries/Graphics/Element.elm+1−1
@@ -12,7 +12,7 @@ module Grapics.Element (widthOf, heightOf, sizeOf,
1212 spacer
1313 ) where
1414
15−import Native.Guid (guid)
15+import Native.Utils (guid)
1616import JavaScript as JS
1717import List as List
1818import Graphics.Color
libraries/Json/Experimental.elm+6−6
@@ -2,11 +2,11 @@
22module Json.Experimental where
33
44import JavaScript as JS
5−import Native.Json as Native
5+import Native.Json (recordFromJSString, recordToPrettyJSString
66
7−fromString s = Native.recordFromJSString (JS.fromString s)
8−fromJSString = Native.recordFromJSString
7+fromString s = recordFromJSString (JS.fromString s)
8+fromJSString = recordFromJSString
99
10−toString r = JS.toString (Native.recordToPrettyJSString "" r)
11−toPrettyString sep r = JS.toString (Native.recordToPrettyJSString sep r)
12−toJSString r = Native.recordToPrettyJSString "" r
10+toString r = JS.toString (recordToPrettyJSString "" r)
11+toPrettyString sep r = JS.toString (recordToPrettyJSString sep r)
12+toJSString r = recordToPrettyJSString "" r
libraries/Keyboard/Raw.elm−3
@@ -6,7 +6,4 @@ import Native.Keyboard.Raw
66type KeyCode = Int
77
88keysDown : Signal [KeyCode]
9−keysDown = Native.Keyboard.Raw.keysDown
10−
119charPressed : Signal (Maybe Char)
12−charPressed = Native.Keyboard.Raw.charPressed
libraries/Native/Utils.js+4−1
@@ -53,6 +53,8 @@ Elm.Native.Utils = function(elm) {
5353 var Tuple0 = { ctor: "Tuple0" }
5454 function Tuple2(x,y) { return { ctor = "Tuple2", _0:x, _1:y } }
5555
56+ var count = 0;
57+ function guid(_) { return count++ }
5658
5759 function copy(r) {
5860 var o = {};
@@ -96,6 +98,7 @@ Elm.Native.Utils = function(elm) {
9698 copy: copy,
9799 remove: remove,
98100 replace: replace,
99− insert: insert
101+ insert: insert,
102+ guid: guid
100103 };
101104};