on master help sign in
Tweaks to the last of the library code.
f903ff3evancz
libraries/Graphics/Color.elm+7−4
@@ -6,7 +6,8 @@ module Graphics.Color (rgba,rgb,hsva,hsv,
6 maroon,navy,green,
6 maroon,navy,green,
7 teal,purple,
7 teal,purple,
8 violet,forestGreen,
8 violet,forestGreen,
9− black,white,gray,grey) where
9+ black,white,gray,grey,
10+ linear,radial) where
10
11
11import Native.Graphics.Color as C
12import Native.Graphics.Color as C
12
13
@@ -39,11 +40,13 @@ purple = Color 128 0 128 1
39forestGreen = Color 34 139 34 1
40forestGreen = Color 34 139 34 1
40violet = Color 238 130 238 1
41violet = Color 238 130 238 1
41
42
42−complement = C.complement
43+complement : Color -> Color
43−hsva = C.hsva
44+hsva : Int -> Float -> Float -> Float -> Color
44−hsv = C.hsv
45+hsv : Int -> Float -> Float -> Color
45
46
46data Gradient
47data Gradient
47 = Linear [(Float,Color)] (Float,Float) (Float,Float)
48 = Linear [(Float,Color)] (Float,Float) (Float,Float)
48 | Radial [(Float,Color)] (Float,Float) Float (Float,Float) Float
49 | Radial [(Float,Color)] (Float,Float) Float (Float,Float) Float
49
50
51+linear = Linear
52+radial = Radial
libraries/Graphics/Element.elm+1−1
@@ -12,7 +12,7 @@ module Grapics.Element (widthOf, heightOf, sizeOf,
12 spacer
12 spacer
13 ) where
13 ) where
14
14
15−import Native.Guid (guid)
15+import Native.Utils (guid)
16import JavaScript as JS
16import JavaScript as JS
17import List as List
17import List as List
18import Graphics.Color
18import Graphics.Color
libraries/Json/Experimental.elm+6−6
@@ -2,11 +2,11 @@
2module Json.Experimental where
2module Json.Experimental where
3
3
4import JavaScript as JS
4import JavaScript as JS
5−import Native.Json as Native
5+import Native.Json (recordFromJSString, recordToPrettyJSString
6
6
7−fromString s = Native.recordFromJSString (JS.fromString s)
7+fromString s = recordFromJSString (JS.fromString s)
8−fromJSString = Native.recordFromJSString
8+fromJSString = recordFromJSString
9
9
10−toString r = JS.toString (Native.recordToPrettyJSString "" r)
10+toString r = JS.toString (recordToPrettyJSString "" r)
11−toPrettyString sep r = JS.toString (Native.recordToPrettyJSString sep r)
11+toPrettyString sep r = JS.toString (recordToPrettyJSString sep r)
12−toJSString r = Native.recordToPrettyJSString "" r
12+toJSString r = recordToPrettyJSString "" r
libraries/Keyboard/Raw.elm−3
@@ -6,7 +6,4 @@ import Native.Keyboard.Raw
6type KeyCode = Int
6type KeyCode = Int
7
7
8keysDown : Signal [KeyCode]
8keysDown : Signal [KeyCode]
9−keysDown = Native.Keyboard.Raw.keysDown
10−
11charPressed : Signal (Maybe Char)
9charPressed : Signal (Maybe Char)
12−charPressed = Native.Keyboard.Raw.charPressed
libraries/Native/Utils.js+4−1
@@ -53,6 +53,8 @@ Elm.Native.Utils = function(elm) {
53 var Tuple0 = { ctor: "Tuple0" }
53 var Tuple0 = { ctor: "Tuple0" }
54 function Tuple2(x,y) { return { ctor = "Tuple2", _0:x, _1:y } }
54 function Tuple2(x,y) { return { ctor = "Tuple2", _0:x, _1:y } }
55
55
56+ var count = 0;
57+ function guid(_) { return count++ }
56
58
57 function copy(r) {
59 function copy(r) {
58 var o = {};
60 var o = {};
@@ -96,6 +98,7 @@ Elm.Native.Utils = function(elm) {
96 copy: copy,
98 copy: copy,
97 remove: remove,
99 remove: remove,
98 replace: replace,
100 replace: replace,
99− insert: insert
101+ insert: insert,
102+ guid: guid
100 };
103 };
101};
104};