8846783 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Use runFile instead of run from jsaddle-wkwebview so that local file access works

commit88467834b7a0914ff2cca2bb83689965b8634cff authorRyan Trinkle <ryan.trinkle@gmail.com> dateSat 30 Dec 2017, 01:31 (9 years ago) parent1cdea31

2 files changed+12−1

unifiedsplit

reflex-dom/reflex-dom.cabal+2

@@ -64,6 +64,8 @@ library

6464 if !impl(ghcjs)

6565 if os(osx) || os(ios)

6666 build-depends:

67+ data-default == 0.7.*,

68+ jsaddle,

6769 jsaddle-wkwebview

6870 else

6971 if flag(webkit2gtk)

reflex-dom/src/Reflex/Dom/Internal.hs+10−1

@@ -1,4 +1,5 @@

11{-# LANGUAGE CPP #-}

2+{-# LANGUAGE OverloadedStrings #-}

23{-# LANGUAGE RankNTypes #-}

34{-# LANGUAGE TypeFamilies #-}

45module Reflex.Dom.Internal

@@ -20,7 +21,15 @@ import qualified Reflex.Dom.Main as Main

2021run :: a -> a

2122run = id

2223#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

2433#elif defined(ANDROID)

2534import Android.HaskellActivity

2635import Control.Monad