From 5b5203a27559f9a6be77f29a1b718328142d4502 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 10 Mar 2013 14:20:39 +0200 Subject: [PATCH] Removed yepnope --- yesod-core/Yesod/Core.hs | 1 - yesod-core/Yesod/Internal/Core.hs | 24 ------------------- yesod-core/test/YesodCoreTest/JsLoader.hs | 5 ---- .../YesodCoreTest/JsLoaderSites/HeadAsync.hs | 16 ------------- yesod-core/yesod-core.cabal | 1 - 5 files changed, 47 deletions(-) delete mode 100644 yesod-core/test/YesodCoreTest/JsLoaderSites/HeadAsync.hs diff --git a/yesod-core/Yesod/Core.hs b/yesod-core/Yesod/Core.hs index a5a51fb6..984fa321 100644 --- a/yesod-core/Yesod/Core.hs +++ b/yesod-core/Yesod/Core.hs @@ -39,7 +39,6 @@ module Yesod.Core , loadClientSession , Header(..) -- * JS loaders - , loadJsYepnope , ScriptLoadPosition (..) , BottomOfHeadAsync -- * Misc diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs index 3c9f73d0..7aaab853 100644 --- a/yesod-core/Yesod/Internal/Core.hs +++ b/yesod-core/Yesod/Internal/Core.hs @@ -31,7 +31,6 @@ module Yesod.Internal.Core -- * jsLoader , ScriptLoadPosition (..) , BottomOfHeadAsync - , loadJsYepnope -- * Misc , yesodVersion , yesodRender @@ -49,12 +48,7 @@ import Yesod.Routes.Class import qualified Network.Wai as W import Yesod.Internal.Session import Yesod.Internal.Request -import Text.Hamlet -import Text.Blaze (unsafeLazyByteString) import Data.Text (Text) -import Data.Aeson (Value (Array, String)) -import Data.Aeson.Encode (encode) -import qualified Data.Vector as Vector import qualified Paths_yesod_core import Data.Version (showVersion) import System.Log.FastLogger (Logger) @@ -104,24 +98,6 @@ maybeAuthorized r isWrite = do x <- isAuthorized r isWrite return $ if x == Authorized then Just r else Nothing -jsonArray :: [Text] -> Html -jsonArray = unsafeLazyByteString . encode . Array . Vector.fromList . map String - --- | For use with setting 'jsLoader' to 'BottomOfHeadAsync' -loadJsYepnope :: Yesod master => Either Text (Route master) -> [Text] -> Maybe (HtmlUrl (Route master)) -> (HtmlUrl (Route master)) -loadJsYepnope eyn scripts mcomplete = - [hamlet| -$newline never - $maybe yn <- left eyn - " res - it "link from head async" $ runner HA $ do - res <- request defaultRequest - assertBody "\n" res - it "link from bottom" $ runner B $ do res <- request defaultRequest assertBody "\n" res diff --git a/yesod-core/test/YesodCoreTest/JsLoaderSites/HeadAsync.hs b/yesod-core/test/YesodCoreTest/JsLoaderSites/HeadAsync.hs deleted file mode 100644 index a7b4dceb..00000000 --- a/yesod-core/test/YesodCoreTest/JsLoaderSites/HeadAsync.hs +++ /dev/null @@ -1,16 +0,0 @@ -{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE FlexibleInstances #-} -module YesodCoreTest.JsLoaderSites.HeadAsync (HA(..), Widget) where - -import Yesod.Core - -data HA = HA -mkYesod "HA" [parseRoutes| -/ HeadAsyncR GET -|] -instance Yesod HA where - jsLoader _ = BottomOfHeadAsync $ loadJsYepnope $ Left "yepnope.js" - -getHeadAsyncR :: Handler RepHtml -getHeadAsyncR = defaultLayout $ addScriptRemote "load.js" diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 610e9bdc..247daad3 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -25,7 +25,6 @@ extra-source-files: test/YesodCoreTest/Json.hs test/YesodCoreTest/JsLoader.hs test/YesodCoreTest/JsLoaderSites/Bottom.hs - test/YesodCoreTest/JsLoaderSites/HeadAsync.hs test/YesodCoreTest/Links.hs test/YesodCoreTest/Media.hs test/YesodCoreTest/MediaData.hs