Merge pull request #17 from slamdata/updates

Update dependencies, fix `accept` parameter for inputs

Author: garyb

bower.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "purescript-media-types": "^4.0.0",
     "purescript-prelude": "^4.0.0",
-    "purescript-web-clipboard": "^1.0.0",
-    "purescript-web-touchevents": "^1.0.0"
+    "purescript-web-clipboard": "^2.0.0",
+    "purescript-web-touchevents": "^2.0.0"
   }
 }

src/DOM/HTML/Indexed.purs

@@ -4,6 +4,7 @@ import DOM.HTML.Indexed.ButtonType (ButtonType)
 import DOM.HTML.Indexed.CrossOriginValue (CrossOriginValue)
 import DOM.HTML.Indexed.DirValue (DirValue)
 import DOM.HTML.Indexed.FormMethod (FormMethod)
+import DOM.HTML.Indexed.InputAcceptType (InputAcceptType)
 import DOM.HTML.Indexed.InputType (InputType)
 import DOM.HTML.Indexed.KindValue (KindValue)
 import DOM.HTML.Indexed.MenuType (MenuType)
@@ -338,7 +339,7 @@ type HTMLimg = Interactive
   )
 
 type HTMLinput = Interactive
-  ( accept :: MediaType
+  ( accept :: InputAcceptType
   , autocomplete :: OnOff
   , autofocus :: Boolean
   , checked :: Boolean

src/DOM/HTML/Indexed/InputAcceptType.purs

@@ -0,0 +1,30 @@
+module DOM.HTML.Indexed.InputAcceptType where
+
+import Prelude
+
+import Data.MediaType (MediaType(..))
+import Data.String as String
+
+newtype InputAcceptType = InputAcceptType (Array InputAcceptTypeAtom)
+
+instance semigroupInputAcceptType :: Semigroup InputAcceptType where
+  append (InputAcceptType a) (InputAcceptType b) = InputAcceptType (a <> b)
+
+mediaType :: MediaType -> InputAcceptType
+mediaType mt = InputAcceptType [AcceptMediaType mt]
+
+extension :: String -> InputAcceptType
+extension ext = InputAcceptType [AcceptFileExtension ext]
+
+data InputAcceptTypeAtom
+  = AcceptMediaType MediaType
+  | AcceptFileExtension String
+
+renderInputAcceptType :: InputAcceptType -> String
+renderInputAcceptType (InputAcceptType atoms) =
+  String.joinWith "," (map renderInputAcceptTypeAtom atoms)
+
+renderInputAcceptTypeAtom :: InputAcceptTypeAtom -> String
+renderInputAcceptTypeAtom = case _ of
+  AcceptMediaType (MediaType mt) -> mt
+  AcceptFileExtension ext -> ext