Switch DOM.Node and DOM.Event to simple-dom

Author: dylex

MODULE.md

@@ -231,14 +231,14 @@
 
     data Element :: *
 
-    type Handler e = Event -> Eff e Unit
+    type Handler e = DOMEvent -> Eff e Unit
 
     data NgEl :: !
 
 
 ### Values
 
-    (!!) :: Element -> Number -> Maybe Node
+    (!!) :: Element -> Number -> Maybe HTMLElement
 
     addClass :: forall e. String -> Element -> ElEff e Element
 
@@ -888,27 +888,6 @@
     timeoutk :: forall e f r. Number -> Boolean -> Timeout -> Eff f r -> TimeoutEff e (TimeoutPromise r)
 
 
-## Module DOM.Event
-
-### Types
-
-    type Event  = { keyCode :: Number }
-
-
-## Module DOM.Node
-
-### Types
-
-    data DOM :: !
-
-    data Node :: *
-
-
-### Values
-
-    focus :: forall e. Node -> Eff (dom :: DOM | e) Unit
-
-
 ## Module DOM.Types
 
 ### Types

bower.json

@@ -17,18 +17,19 @@
     "dist"
   ],
   "dependencies": {
-    "purescript-bifunctors": "0.0.4",
+    "purescript-bifunctors": "0.0.6",
     "purescript-either": "0.1.3",
     "purescript-exceptions": "0.2.1",
-    "purescript-foldable-traversable": "0.1.3",
+    "purescript-foldable-traversable": "0.1.4",
     "purescript-maybe": "0.2.1",
-    "purescript-tuples": "0.2.1"
+    "purescript-tuples": "0.2.1",
+    "purescript-simple-dom": "git://github.com/aktowns/purescript-simple-dom.git"
   },
   "devDependencies": {
     "angular": "1.2.26",
     "todomvc-common": "0.1.9",
-    "purescript-strings": "0.2.1",
-    "purescript-arrays": "0.2.0",
+    "purescript-strings": "0.3.3",
+    "purescript-arrays": "0.2.1",
     "purescript-control": "0.2.1"
   }
 }

examples/Todomvc/Escape.purs

@@ -1,6 +1,9 @@
 module Todomvc.Escape (EscapeDirective(), escape) where
 
 import Data.Maybe
+import Control.Bind ((>=>))
+
+import Data.DOM.Simple.Events (keyCode)
 
 import Angular.Attributes (get)
 import Angular.Element (on)
@@ -11,7 +14,8 @@ foreign import data EscapeDirective :: *
 escapeKey = 27
 
 link scope element attrs = do
-  on "keydown" (\e -> if e.keyCode == escapeKey
+  on "keydown" (keyCode >=> \kc ->
+                      if kc == escapeKey
                       then (get attrs) >>= (\as -> apply (stringApplyExpr as.todoEscape) scope)
                       else return unit) element
 

examples/Todomvc/Focus.purs

@@ -4,7 +4,7 @@ import Data.Maybe
 import Control.Monad (when)
 import Control.Monad.Eff
 
-import qualified DOM.Node as D
+import qualified Data.DOM.Simple.Element as D
 
 import Angular.Attributes (get)
 import Angular.Element ((!!))

src/Angular/Element.purs

@@ -62,15 +62,14 @@ import Control.Monad.Eff
 import Data.Function (Fn3(), Fn4(), Fn5(), runFn3, runFn4, runFn5)
 import Data.Maybe
 
-import DOM.Event (Event())
-import DOM.Node (Node())
+import Data.DOM.Simple.Types (HTMLElement(), DOMEvent())
 
 import Angular.Injector (Injector())
 import Angular.Scope (Scope())
 
 type ElEff e r = Eff (ngel :: NgEl | e) r
 
-type Handler e = Event -> Eff e Unit
+type Handler e = DOMEvent -> Eff e Unit
 
 foreign import data Element :: *
 
@@ -612,9 +611,9 @@ foreign import bangbangFn
   \   var r = el[i]; \
   \   return angular.isDefined(r) ? just(r) : nothing; \
   \ }"
-  :: Fn4 (Maybe Node) (Node -> Maybe Node) Element Number (Maybe Node)
+  :: Fn4 (Maybe HTMLElement) (HTMLElement -> Maybe HTMLElement) Element Number (Maybe HTMLElement)
 
 infixl 8 !!
 
-(!!) :: Element -> Number -> Maybe Node
+(!!) :: Element -> Number -> Maybe HTMLElement
 (!!) = runFn4 bangbangFn Nothing Just