Merge pull request #51 from spicydonuts/master

Updates for psc 0.9.1

Author: garyb

bower.json

@@ -20,12 +20,18 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-unsafe-coerce": "^0.1.0",
-    "purescript-enums": "^0.7.0",
-    "purescript-foreign": "^0.7.0",
-    "purescript-exceptions": "~0.3.0",
-    "purescript-nullable": "~0.2.1",
-    "purescript-datetime": "~0.9.1",
-    "purescript-media-types": "~0.1.1"
+    "purescript-unsafe-coerce": "^1.0.0",
+    "purescript-enums": "^1.0.0",
+    "purescript-foreign": "^1.0.0",
+    "purescript-exceptions": "~1.0.0",
+    "purescript-nullable": "^1.0.0",
+    "purescript-datetime": "~1.0.0",
+    "purescript-media-types": "~1.0.0",
+    "purescript-prelude": "^1.0.0",
+    "purescript-foldable-traversable": "^1.0.0",
+    "purescript-js-date": "^1.0.0"
+  },
+  "devDependencies": {
+    "purescript-psci-support": "^1.0.0"
   }
 }

src/DOM/Event/DragEvent/DataTransfer.js

@@ -1,7 +1,5 @@
 "use strict";
 
-// module DOM.Event.DragEvent.DataTransfer
-
 exports.files = function (dataTransfer) {
   return dataTransfer.files;
 };

src/DOM/Event/DragEvent/DataTransfer.purs

@@ -1,6 +1,6 @@
 module DOM.Event.DragEvent.DataTransfer where
 
-import DOM.File.Types (FileList())
+import DOM.File.Types (FileList)
 
 foreign import data DataTransfer :: *
 

src/DOM/Event/Event.js

@@ -1,7 +1,5 @@
 "use strict";
 
-// module DOM.Event.Event
-
 exports.bubbles = function (e) {
   return e.bubbles;
 };

src/DOM/Event/Event.purs

@@ -14,16 +14,13 @@ module DOM.Event.Event
   ) where
 
 import Prelude
-
-import Control.Monad.Eff (Eff())
-
+import Control.Monad.Eff (Eff)
 import Data.Enum (toEnum)
-import qualified Data.Maybe.Unsafe as U
-
-import DOM
-import DOM.Event.EventPhase
-import DOM.Event.Types
-import DOM.Node.Types
+import Data.Maybe (fromJust)
+import DOM (DOM)
+import DOM.Event.EventPhase (EventPhase)
+import DOM.Event.Types (Event, EventType)
+import DOM.Node.Types (Node)
 
 -- | The event type.
 foreign import type_ :: Event -> EventType
@@ -36,8 +33,8 @@ foreign import currentTarget :: Event -> Node
 
 -- | Indicates which phase of the event flow that is currently being processed
 -- | for the event.
-eventPhase :: Event -> EventPhase
-eventPhase = U.fromJust <<< toEnum <<< eventPhaseIndex
+eventPhase :: Partial => Event -> EventPhase
+eventPhase = fromJust <<< toEnum <<< eventPhaseIndex
 
 -- | The integer value for the current event phase.
 foreign import eventPhaseIndex :: Event -> Int

src/DOM/Event/EventPhase.purs

@@ -1,8 +1,7 @@
 module DOM.Event.EventPhase (EventPhase(..)) where
 
 import Prelude
-
-import Data.Enum (Enum, Cardinality(..), defaultSucc, defaultPred)
+import Data.Enum (class Enum, class BoundedEnum, Cardinality(..), defaultSucc, defaultPred)
 import Data.Maybe (Maybe(..))
 
 data EventPhase
@@ -11,12 +10,7 @@ data EventPhase
   | AtTarget
   | Bubbling
 
-instance eqEventPhase :: Eq EventPhase where
-  eq None None = true
-  eq Capturing Capturing = true
-  eq AtTarget AtTarget = true
-  eq Bubbling Bubbling = true
-  eq _ _ = false
+derive instance eqEventPhase :: Eq EventPhase
 
 instance ordEventPhase :: Ord EventPhase where
   compare x y = compare (fromEnumEventPhase x) (fromEnumEventPhase y)
@@ -25,12 +19,12 @@ instance boundedEventPhase :: Bounded EventPhase where
   bottom = None
   top = Bubbling
 
-instance boundedOrdEventPhase :: BoundedOrd EventPhase
-
 instance enumEventPhase :: Enum EventPhase where
-  cardinality = Cardinality 4
   succ = defaultSucc toEnumEventPhase fromEnumEventPhase
   pred = defaultPred toEnumEventPhase fromEnumEventPhase
+
+instance boundedEnumEventPhase :: BoundedEnum EventPhase where
+  cardinality = Cardinality 4
   toEnum = toEnumEventPhase
   fromEnum = fromEnumEventPhase
 

src/DOM/Event/EventTarget.js

@@ -1,7 +1,5 @@
 "use strict";
 
-// module DOM.Event.EventTarget
-
 exports.eventListener = function (fn) {
   return function (event) {
     return fn(event)();

src/DOM/Event/EventTarget.purs

@@ -1,12 +1,10 @@
 module DOM.Event.EventTarget where
 
 import Prelude
-
-import Control.Monad.Eff (Eff())
-import Control.Monad.Eff.Exception (EXCEPTION())
-
-import DOM
-import DOM.Event.Types
+import Control.Monad.Eff (Eff)
+import Control.Monad.Eff.Exception (EXCEPTION)
+import DOM (DOM)
+import DOM.Event.Types (EventTarget, Event, EventType)
 
 -- | A boxed function that can be used as an event listener. This is necessary
 -- | due to the underling implementation of Eff functions.

src/DOM/Event/Types.js

@@ -1,12 +1,12 @@
 /* global EventTarget */
 "use strict";
 
-// module DOM.Event.Types
-
 exports._readEventTarget = function (left) {
   return function (right) {
     return function (foreign) {
-      return foreign instanceof EventTarget ? left("Value is not an EventTarget") : right(foreign);
+      return foreign instanceof EventTarget
+        ? left("Value is not an EventTarget")
+        : right(foreign);
     };
   };
 };