git.iko.soy/reflex-dom
on develop help sign in
Use runFile instead of run from jsaddle-wkwebview so that local file access works
8846783Ryan Trinkle
reflex-dom/reflex-dom.cabal+2
compare with develop
unifiedsplit
@@ -64,6 +64,8 @@ library
64 if !impl(ghcjs)
64 if !impl(ghcjs)
65 if os(osx) || os(ios)
65 if os(osx) || os(ios)
66 build-depends:
66 build-depends:
67+ data-default == 0.7.*,
68+ jsaddle,
67 jsaddle-wkwebview
69 jsaddle-wkwebview
68 else
70 else
69 if flag(webkit2gtk)
71 if flag(webkit2gtk)
reflex-dom/src/Reflex/Dom/Internal.hs+10−1
@@ -1,4 +1,5 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE RankNTypes #-}
3{-# LANGUAGE RankNTypes #-}
3{-# LANGUAGE TypeFamilies #-}
4{-# LANGUAGE TypeFamilies #-}
4module Reflex.Dom.Internal
5module Reflex.Dom.Internal
@@ -20,7 +21,15 @@ import qualified Reflex.Dom.Main as Main
20run :: a -> a
21run :: a -> a
21run = id
22run = id
22#elif defined(MIN_VERSION_jsaddle_wkwebview)
23#elif defined(MIN_VERSION_jsaddle_wkwebview)
23−import Language.Javascript.JSaddle.WKWebView (run)
24+import Language.Javascript.JSaddle.WKWebView (runFile)
25+import Language.Javascript.JSaddle (JSM)
26+import Data.Default (def)
27+
28+--TODO: Eliminate this; it is needed because otherwise the app's base
29+--URL will be set to "about:blank" due to jsaddleMain rather than
30+--jsaddleMainFile being used
31+run :: JSM () -> IO ()
32+run = runFile "index.html" "" def
24#elif defined(ANDROID)
33#elif defined(ANDROID)
25import Android.HaskellActivity
34import Android.HaskellActivity
26import Control.Monad
35import Control.Monad