Merge branch 'master' into dev

Elm.cabal

@@ -1,5 +1,5 @@
 Name:                Elm
-Version:             0.10.1
+Version:             0.11
 Synopsis:            The Elm language module.
 Description:         Elm aims to make client-side web-development more pleasant.
                      It is a statically/strongly typed, functional reactive

README.md

@@ -7,7 +7,7 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/)
 **Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
 jump to the [My First Project](#my-first-project) section.
 <br/>
-**OS X 10.9** &mdash; follow
+**OS X 10.9 or XCode 5** &mdash; follow
 [these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)
 before continuing with the platform agnostic directions below.
 

compiler/SourceSyntax/Expression.hs

@@ -1,12 +1,12 @@
 {-# OPTIONS_GHC -Wall #-}
-module SourceSyntax.Expression where
+
 {-| The Abstract Syntax Tree (AST) for expressions comes in a couple formats.
 The first is the fully general version and is labeled with a prime (Expr').
 The others are specialized versions of the AST that represent specific phases
 of the compilation process. I expect there to be more phases as we begin to
 enrich the AST with more information.
 -}
-
+module SourceSyntax.Expression where
 
 import SourceSyntax.PrettyPrint
 import Text.PrettyPrint as P

libraries/Basics.elm

@@ -320,7 +320,7 @@ It is defined as:
         always a b = a
 
 It totally ignores the second argument, so `always 42` is a function that always
-returns in 42. When you are dealing with higher-order functions, this comes in
+returns 42. When you are dealing with higher-order functions, this comes in
 handy more often than you might expect. For example, creating a zeroed out list
 of length ten would be:
 

libraries/elm_dependencies.json

@@ -1,9 +1,9 @@
-{ "version": "0.10.1"
+{ "version": "0.11"
 , "summary": "Elm's standard libraries"
-, "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."
+, "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."
 , "license": "BSD3"
 , "repository": "http://github.com/evancz/Elm.git"
-, "elm-version": "0.10.1"
+, "elm-version": "0.11"
 , "dependencies": {}
 , "exposed-modules":
     [ "Basics"

runtime/Utils.js

@@ -34,7 +34,7 @@ ElmRuntime.filterDeadInputs = function(inputs) {
 
 // define the draw function
 var vendors = ['ms', 'moz', 'webkit', 'o'];
-var win = window || {};
+var win = typeof window !== 'undefined' ? window : {};
 for (var i = 0; i < vendors.length && !win.requestAnimationFrame; ++i) {
     win.requestAnimationFrame = win[vendors[i]+'RequestAnimationFrame'];
     win.cancelAnimationFrame  = win[vendors[i]+'CancelAnimationFrame'] ||