git.iko.soy/reflex-dom
on develop help sign in
Use WKWebView on OS X
e0c8dcbHamish Mackenzie
reflex-dom/reflex-dom.cabal+8−4
compare with develop
unifiedsplit
@@ -28,12 +28,16 @@ library
28 reflex == 0.5.*,
28 reflex == 0.5.*,
29 reflex-dom-core >=0.4 && <0.5,
29 reflex-dom-core >=0.4 && <0.5,
30 text == 1.2.*
30 text == 1.2.*
31− if flag(webkit2gtk)
31+ if os(osx)
32 build-depends:
32 build-depends:
33− jsaddle-webkit2gtk
33+ jsaddle-wkwebview
34 else
34 else
35+ if flag(webkit2gtk)
35− build-depends:
36+ build-depends:
37+ jsaddle-webkit2gtk
38+ else
39+ build-depends:
36− jsaddle-webkitgtk
40+ jsaddle-webkitgtk
37
41
38 exposed-modules:
42 exposed-modules:
39 Reflex.Dom
43 Reflex.Dom
reflex-dom/src/Reflex/Dom/Internal.hs+5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE RankNTypes #-}
2{-# LANGUAGE RankNTypes #-}
2{-# LANGUAGE TypeFamilies #-}
3{-# LANGUAGE TypeFamilies #-}
3module Reflex.Dom.Internal
4module Reflex.Dom.Internal
@@ -14,7 +15,11 @@ import Reflex.Dom.Main as Main hiding
14import qualified Reflex.Dom.Main as Main
15import qualified Reflex.Dom.Main as Main
15 (mainWidget, mainWidgetWithHead, mainWidgetWithCss,
16 (mainWidget, mainWidgetWithHead, mainWidgetWithCss,
16 mainWidgetWithHead', mainWidgetInElementById, runApp')
17 mainWidgetWithHead', mainWidgetInElementById, runApp')
18+#ifdef darwin_HOST_OS
19+import Language.Javascript.JSaddle.WKWebView (run)
20+#else
17import Language.Javascript.JSaddle.WebKitGTK (run)
21import Language.Javascript.JSaddle.WebKitGTK (run)
22+#endif
18
23
19mainWidget :: (forall x. Widget x ()) -> IO ()
24mainWidget :: (forall x. Widget x ()) -> IO ()
20mainWidget w = run $ Main.mainWidget w
25mainWidget w = run $ Main.mainWidget w