83 lines
3 KiB
Diff
83 lines
3 KiB
Diff
From a603bac40f0a0f6232fbfb056a778860270101de Mon Sep 17 00:00:00 2001
|
|
From: Joey Hess <joey@kitenet.net>
|
|
Date: Mon, 15 Apr 2013 15:59:56 -0400
|
|
Subject: [PATCH 1/2] prepare for Evil Splicer
|
|
|
|
---
|
|
Yesod/Form/Functions.hs | 3 +--
|
|
evilsplicer-headers.hs | 9 +++++++++
|
|
yesod-form.cabal | 5 +++--
|
|
3 files changed, 13 insertions(+), 4 deletions(-)
|
|
create mode 100644 evilsplicer-headers.hs
|
|
|
|
diff --git a/Yesod/Form/Functions.hs b/Yesod/Form/Functions.hs
|
|
index db3e493..89eb1e8 100644
|
|
--- a/Yesod/Form/Functions.hs
|
|
+++ b/Yesod/Form/Functions.hs
|
|
@@ -54,10 +54,9 @@ import Text.Blaze (Markup, toMarkup)
|
|
#define toHtml toMarkup
|
|
import Yesod.Handler (GHandler, getRequest, runRequestBody, newIdent, getYesod)
|
|
import Yesod.Core (RenderMessage, SomeMessage (..))
|
|
-import Yesod.Widget (GWidget, whamlet)
|
|
+import Yesod.Widget (GWidget)
|
|
import Yesod.Request (reqToken, reqWaiRequest, reqGetParams, languages)
|
|
import Network.Wai (requestMethod)
|
|
-import Text.Hamlet (shamlet)
|
|
import Data.Monoid (mempty)
|
|
import Data.Maybe (listToMaybe, fromMaybe)
|
|
import Yesod.Message (RenderMessage (..))
|
|
diff --git a/evilsplicer-headers.hs b/evilsplicer-headers.hs
|
|
new file mode 100644
|
|
index 0000000..865d043
|
|
--- /dev/null
|
|
+++ b/evilsplicer-headers.hs
|
|
@@ -0,0 +1,9 @@
|
|
+import qualified Data.Text.Lazy.Builder
|
|
+import qualified Text.Shakespeare
|
|
+import qualified Text.Hamlet
|
|
+import qualified Data.Monoid
|
|
+import qualified Text.Julius
|
|
+import qualified "blaze-markup" Text.Blaze.Internal
|
|
+import qualified "blaze-markup" Text.Blaze as Text.Blaze.Markup
|
|
+import qualified Yesod.Widget
|
|
+import qualified Data.Foldable
|
|
diff --git a/yesod-form.cabal b/yesod-form.cabal
|
|
index a0d2a80..ae99ddc 100644
|
|
--- a/yesod-form.cabal
|
|
+++ b/yesod-form.cabal
|
|
@@ -18,7 +18,7 @@ library
|
|
, yesod-persistent >= 1.1 && < 1.2
|
|
, time >= 1.1.4
|
|
, hamlet >= 1.1 && < 1.2
|
|
- , shakespeare-css >= 1.0 && < 1.1
|
|
+ , shakespeare-css == 1.0.2
|
|
, shakespeare-js >= 1.0.2 && < 1.2
|
|
, persistent >= 1.0 && < 1.2
|
|
, template-haskell
|
|
@@ -37,6 +37,7 @@ library
|
|
, attoparsec >= 0.10 && < 0.11
|
|
, crypto-api >= 0.8 && < 0.11
|
|
, aeson
|
|
+ , shakespeare
|
|
|
|
exposed-modules: Yesod.Form
|
|
Yesod.Form.Class
|
|
@@ -45,7 +46,6 @@ library
|
|
Yesod.Form.Input
|
|
Yesod.Form.Fields
|
|
Yesod.Form.Jquery
|
|
- Yesod.Form.Nic
|
|
Yesod.Form.MassInput
|
|
Yesod.Form.I18n.English
|
|
Yesod.Form.I18n.Portuguese
|
|
@@ -56,6 +56,7 @@ library
|
|
Yesod.Form.I18n.Japanese
|
|
-- FIXME Yesod.Helpers.Crud
|
|
ghc-options: -Wall
|
|
+ Extensions: PackageImports
|
|
|
|
test-suite test
|
|
type: exitcode-stdio-1.0
|
|
--
|
|
1.8.2.rc3
|
|
|