git.iko.soy/reflex-dom
on develop help sign in
Use WKWebView on OS X
commite0c8dcb2d6e21e3c432acf81b9ddae54a1a9b2ad authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateFri 23 Dec 2016, 19:04 (10 years ago) parent48252bb
2 files changed+13−4
compare with develop
unifiedsplit
reflex-dom/reflex-dom.cabal+8−4 reflex-dom/src/Reflex/Dom/Internal.hs+5
reflex-dom/reflex-dom.cabal+8−4
@@ -28,12 +28,16 @@ library
2828 reflex == 0.5.*,
2929 reflex-dom-core >=0.4 && <0.5,
3030 text == 1.2.*
31− if flag(webkit2gtk)
31+ if os(osx)
3232 build-depends:
33− jsaddle-webkit2gtk
33+ jsaddle-wkwebview
3434 else
35− build-depends:
36− jsaddle-webkitgtk
35+ if flag(webkit2gtk)
36+ build-depends:
37+ jsaddle-webkit2gtk
38+ else
39+ build-depends:
40+ jsaddle-webkitgtk
3741
3842 exposed-modules:
3943 Reflex.Dom
reflex-dom/src/Reflex/Dom/Internal.hs+5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE RankNTypes #-}
23{-# LANGUAGE TypeFamilies #-}
34module Reflex.Dom.Internal
@@ -14,7 +15,11 @@ import Reflex.Dom.Main as Main hiding
1415import qualified Reflex.Dom.Main as Main
1516 (mainWidget, mainWidgetWithHead, mainWidgetWithCss,
1617 mainWidgetWithHead', mainWidgetInElementById, runApp')
18+#ifdef darwin_HOST_OS
19+import Language.Javascript.JSaddle.WKWebView (run)
20+#else
1721import Language.Javascript.JSaddle.WebKitGTK (run)
22+#endif
1823
1924mainWidget :: (forall x. Widget x ()) -> IO ()
2025mainWidget w = run $ Main.mainWidget w