Rename event 'type_' function to 'eventType_'

iand675 · Jun 8, 2016 · 1bf58e3 · 1bf58e3
1 parent 08f71b7
commit 1bf58e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/React.hs b/src/React.hs
@@ -593,8 +593,8 @@ class SyntheticEvent e where
   timeStamp :: MonadIO m => e -> m Int
   timeStamp = liftIO . js_timeStamp . eventVal
 
-  type_ :: MonadIO m => e -> m JSString
-  type_ = liftIO . js_type . eventVal
+  eventType_ :: MonadIO m => e -> m JSString
+  eventType_ = liftIO . js_type . eventVal
 
 {-
 class ErrorEvent e where {}
@@ -709,7 +709,7 @@ makeClass newName n = do
     newName' = mkName newName
     noInlineFun = PragmaD $ InlineP newName' NoInline FunLike AllPhases
 
-foreign import javascript unsafe "$1.props[$2]" js_getProp :: This ps st -> JSString -> IO JSVal
+foreign import javascript unsafe "($1 ? $1.props[$2] : null)" js_getProp :: This ps st -> JSString -> IO JSVal
 
 getProp :: FromJSVal p => This ps st -> PropName p -> Maybe p
 getProp this (PropName p) = unsafePerformIO $ do