diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-04 01:48:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-04 01:48:26 -0400 |
| commit | 0d021ce388369f3f683f9c9c8d13b5c983b12ca3 (patch) | |
| tree | dab67313491f4680ef0454f6396f6007d750511a /Assistant/NamedThread.hs | |
| parent | 8fb369aa5667f95d46b24f26b06636559155402b (diff) | |
refactor alert button creation code
Diffstat (limited to 'Assistant/NamedThread.hs')
| -rw-r--r-- | Assistant/NamedThread.hs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Assistant/NamedThread.hs b/Assistant/NamedThread.hs index 1d291ba74..edebe830f 100644 --- a/Assistant/NamedThread.hs +++ b/Assistant/NamedThread.hs @@ -23,8 +23,8 @@ import qualified Data.Map as M import qualified Control.Exception as E #ifdef WITH_WEBAPP -import Assistant.WebApp import Assistant.WebApp.Types +import Assistant.Types.Alert import Assistant.Alert import qualified Data.Text as T #endif @@ -65,17 +65,13 @@ startNamedThread urlrenderer namedthread@(NamedThread name a) = do ] hPutStrLn stderr msg #ifdef WITH_WEBAPP - button <- runAssistant d $ do - close <- asIO1 removeAlert - url <- liftIO $ renderUrl urlrenderer (RestartThreadR name) [] - return $ Just $ AlertButton - { buttonLabel = T.pack "Restart Thread" - , buttonUrl = url - , buttonAction = Just close - } - runAssistant d $ void $ - addAlert $ (warningAlert (fromThreadName name) msg) - { alertButton = button } + button <- runAssistant d $ mkAlertButton + (T.pack "Restart Thread") + urlrenderer + (RestartThreadR name) + runAssistant d $ void $ addAlert $ + (warningAlert (fromThreadName name) msg) + { alertButton = Just button } #endif namedThreadId :: NamedThread -> Assistant (Maybe ThreadId) |