54a2f25 · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'master' into dev

commit54a2f255846fd56cc72b1f60a682bfb19fde98f5 authorEvan Czaplicki <info@elm-lang.org> dateThu 23 Jan 2014, 18:46 (13 years ago) parentdf95c68 daeccdc

6 files changed+9−9

compare with master

unifiedsplit

Elm.cabal+1−1 README.md+1−1 compiler/SourceSyntax/Expression.hs+2−2 libraries/Basics.elm+1−1 libraries/elm_dependencies.json+3−3 runtime/Utils.js+1−1

Elm.cabal+1−1

@@ -1,5 +1,5 @@

11Name: Elm

2−Version: 0.10.1

2+Version: 0.11

33Synopsis: The Elm language module.

44Description: Elm aims to make client-side web-development more pleasant.

55 It is a statically/strongly typed, functional reactive

README.md+1−1

@@ -7,7 +7,7 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/)

77**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then

88jump to the [My First Project](#my-first-project) section.

99<br/>

10−**OS X 10.9** — follow

10+**OS X 10.9 or XCode 5** — follow

1111[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)

1212before continuing with the platform agnostic directions below.

1313

compiler/SourceSyntax/Expression.hs+2−2

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

11{-# OPTIONS_GHC -Wall #-}

2−module SourceSyntax.Expression where

33{-| The Abstract Syntax Tree (AST) for expressions comes in a couple formats.

44The first is the fully general version and is labeled with a prime (Expr').

55The others are specialized versions of the AST that represent specific phases

66of the compilation process. I expect there to be more phases as we begin to

77enrich the AST with more information.

88-}

9−

9+module SourceSyntax.Expression where

1010

1111import SourceSyntax.PrettyPrint

1212import Text.PrettyPrint as P

libraries/Basics.elm+1−1

@@ -320,7 +320,7 @@ It is defined as:

320320 always a b = a

321321

322322It totally ignores the second argument, so `always 42` is a function that always

323−returns in 42. When you are dealing with higher-order functions, this comes in

323+returns 42. When you are dealing with higher-order functions, this comes in

324324handy more often than you might expect. For example, creating a zeroed out list

325325of length ten would be:

326326

libraries/elm_dependencies.json+3−3

@@ -1,9 +1,9 @@

1−{ "version": "0.10.1"

1+{ "version": "0.11"

22, "summary": "Elm's standard libraries"

3−, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.10.1, you should be using version 0.10.1 of the standard libraries."

3+, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.11, you should be using version 0.11 of the standard libraries."

44, "license": "BSD3"

55, "repository": "http://github.com/evancz/Elm.git"

6−, "elm-version": "0.10.1"

6+, "elm-version": "0.11"

77, "dependencies": {}

88, "exposed-modules":

99 [ "Basics"

runtime/Utils.js+1−1

@@ -34,7 +34,7 @@ ElmRuntime.filterDeadInputs = function(inputs) {

3434

3535// define the draw function

3636var vendors = ['ms', 'moz', 'webkit', 'o'];

37−var win = window || {};

37+var win = typeof window !== 'undefined' ? window : {};

3838for (var i = 0; i < vendors.length && !win.requestAnimationFrame; ++i) {

3939 win.requestAnimationFrame = win[vendors[i]+'RequestAnimationFrame'];

4040 win.cancelAnimationFrame = win[vendors[i]+'CancelAnimationFrame'] ||