Merge branch '0.16'

evancz · Nov 19, 2015 · 0d0a136 · 0d0a136 · fredcy · Nov 25, 2015
2 parents 618c042 + 8d29ec0
commit 0d0a136
Show file tree

Hide file tree

Showing 3 changed files with 11,970 additions and 46 deletions.
diff --git a/Todo.elm b/Todo.elm
@@ -89,45 +89,45 @@ update action model =
 
       Add ->
           { model |
-              uid <- model.uid + 1,
-              field <- "",
-              tasks <-
+              uid = model.uid + 1,
+              field = "",
+              tasks =
                   if String.isEmpty model.field
                     then model.tasks
                     else model.tasks ++ [newTask model.field model.uid]
           }
 
       UpdateField str ->
-          { model | field <- str }
+          { model | field = str }
 
       EditingTask id isEditing ->
-          let updateTask t = if t.id == id then { t | editing <- isEditing } else t
+          let updateTask t = if t.id == id then { t | editing = isEditing } else t
           in
-              { model | tasks <- List.map updateTask model.tasks }
+              { model | tasks = List.map updateTask model.tasks }
 
       UpdateTask id task ->
-          let updateTask t = if t.id == id then { t | description <- task } else t
+          let updateTask t = if t.id == id then { t | description = task } else t
           in
-              { model | tasks <- List.map updateTask model.tasks }
+              { model | tasks = List.map updateTask model.tasks }
 
       Delete id ->
-          { model | tasks <- List.filter (\t -> t.id /= id) model.tasks }
+          { model | tasks = List.filter (\t -> t.id /= id) model.tasks }
 
       DeleteComplete ->
-          { model | tasks <- List.filter (not << .completed) model.tasks }
+          { model | tasks = List.filter (not << .completed) model.tasks }
 
       Check id isCompleted ->
-          let updateTask t = if t.id == id then { t | completed <- isCompleted } else t
+          let updateTask t = if t.id == id then { t | completed = isCompleted } else t
           in
-              { model | tasks <- List.map updateTask model.tasks }
+              { model | tasks = List.map updateTask model.tasks }
 
       CheckAll isCompleted ->
-          let updateTask t = { t | completed <- isCompleted }
+          let updateTask t = { t | completed = isCompleted }
           in
-              { model | tasks <- List.map updateTask model.tasks }
+              { model | tasks = List.map updateTask model.tasks }
 
       ChangeVisibility visibility ->
-          { model | visibility <- visibility }
+          { model | visibility = visibility }
 
 
 ---- VIEW ----
@@ -184,7 +184,7 @@ taskList address visibility tasks =
             case visibility of
               "Completed" -> todo.completed
               "Active" -> not todo.completed
-              "All" -> True
+              _ -> True
 
         allCompleted = List.all .completed tasks
 
@@ -333,7 +333,10 @@ port focus =
               EditingTask id bool -> bool
               _ -> False
 
-        toSelector (EditingTask id _) = ("#todo-" ++ toString id)
+        toSelector act =
+            case act of
+              EditingTask id _ -> "#todo-" ++ toString id
+              _ -> ""
     in
         actions.signal
           |> Signal.filter needsFocus (EditingTask 0 True)

diff --git a/elm-package.json b/elm-package.json
@@ -8,8 +8,8 @@
     ],
     "exposed-modules": [],
     "dependencies": {
-        "elm-lang/core": "2.0.0 <= v < 3.0.0",
-        "evancz/elm-html": "3.0.0 <= v < 4.0.0"
+        "elm-lang/core": "3.0.0 <= v < 4.0.0",
+        "evancz/elm-html": "4.0.2 <= v < 5.0.0"
     },
-    "elm-version": "0.15.0 <= v < 0.16.0"
-}
+    "elm-version": "0.16.0 <= v < 0.17.0"
+}