Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Miso/FFI.hs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import Language.Javascript.JSaddle hiding (obj, val)
#else
import Language.Javascript.JSaddle hiding (Success, obj, val)
#endif
import Miso.String hiding (show)
import Miso.String

-- | Run given `JSM` action asynchronously, in a separate thread.
forkJSM :: JSM () -> JSM ()
Expand Down
2 changes: 1 addition & 1 deletion src/Miso/Html/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import Text.HTML.TagSoup (Tag(..))
import Miso.Effect
import Miso.Event
import Miso.FFI
import Miso.String hiding (reverse, elem, show )
import Miso.String hiding (reverse, elem)

-- | Core type for constructing a `VTree`, use this instead of `VTree` directly.
data View action
Expand Down
2 changes: 1 addition & 1 deletion src/Miso/Subscription/History.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import Miso.Concurrent
import Miso.Effect (Sub)
import Miso.FFI
import qualified Miso.FFI.History as FFI
import Miso.String hiding (show)
import Miso.String
import Network.URI hiding (path)
import System.IO.Unsafe

Expand Down
21 changes: 12 additions & 9 deletions text-src/Miso/String.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,26 @@ module Miso.String
, FromMisoString (..)
, fromMisoString
, MisoString
, module Data.Monoid
, module Data.Text
, module S
, ms
) where

import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as BL
import Data.Monoid
import Data.Monoid as S
import Data.JSString
import Data.JSString.Text
import Data.Text
#if MIN_VERSION_text(2,1,2)
import Data.Text as S hiding (show)
#else
import Data.Text as S
#endif
import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import qualified Data.Text.Lazy as LT
import qualified Data.Text.Lazy.Encoding as LT
import Text.Read(readEither)

import Prelude as P

-- | String type swappable based on compiler
type MisoString = Text
Expand Down Expand Up @@ -70,13 +73,13 @@ instance ToMisoString B.ByteString where
instance ToMisoString BL.ByteString where
toMisoString = toMisoString . LT.decodeUtf8
instance ToMisoString Float where
toMisoString = T.pack . Prelude.show
toMisoString = T.pack . P.show
instance ToMisoString Double where
toMisoString = T.pack . Prelude.show
toMisoString = T.pack . P.show
instance ToMisoString Int where
toMisoString = T.pack . Prelude.show
toMisoString = T.pack . P.show
instance ToMisoString Word where
toMisoString = T.pack . Prelude.show
toMisoString = T.pack . P.show

instance FromMisoString MisoString where
fromMisoStringEither = Right
Expand Down