diff --git a/Makefile b/Makefile index ce7c0762..a5c038a3 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ releaseClient: # make installClient or prodInstallClient first! curlReleaseClient: # this uses curl to download and unzip a recent pre-built client from a GitHub release rm -rf Estuary.jsexe - curl -o temp.zip -L https://github.com/d0kt0r0/estuary/releases/download/20181028/estuary-client-20181028.zip + curl -o temp.zip -L https://github.com/d0kt0r0/estuary/releases/download/20181107/estuary-client-20181107.zip unzip temp.zip rm -rf temp.zip cp -Rf static/Dirt Estuary.jsexe diff --git a/client/src/Estuary/Tutorials/IntroTidalText.hs b/client/src/Estuary/Tutorials/IntroTidalText.hs index 81dfd496..cec809da 100644 --- a/client/src/Estuary/Tutorials/IntroTidalText.hs +++ b/client/src/Estuary/Tutorials/IntroTidalText.hs @@ -13,6 +13,9 @@ import Estuary.Tidal.Types introTidalText::MonadWidget t m => Tutorial t m introTidalText = Tutorial IntroTidalText (const $ return (constDyn empty, never)) +{- + + miniTidalWidget :: MonadWidget t m => Int -> String -> m (Dynamic t (Int, Definition),Event t Hint) miniTidalWidget index initial = do @@ -67,7 +70,7 @@ miniTidalWidget index initial = do -widget::(Dynamic t Context -> m (Dynamic t DefinitionMap, Event t Hint)) +widget::(Dynamic t Context -> m (Dynamic t DefinitionMap, Event t Hint)) -} {- | v1 :: Language -> (View, Definition) v1 English = (LabelView 0, LabelText "Welcome to the introductory tutorial to Tidalcycles (or MiniTidal)") diff --git a/client/src/Estuary/Widgets/Sequencer.hs b/client/src/Estuary/Widgets/Sequencer.hs index 3a5a4104..af53a06f 100644 --- a/client/src/Estuary/Widgets/Sequencer.hs +++ b/client/src/Estuary/Widgets/Sequencer.hs @@ -85,7 +85,7 @@ rowToGenPat' (val,pos) = Group (Live (fmap toAtom pos,Once) L4) Inert parsed = maybe (maybe (Blank Inert) f $ readMaybe $ "\""++val++"\"") f $ readMaybe val f x = Atom x Inert Once - +{- sequencer' ::MonadWidget t m => [(String, [Bool])] -> Event t [(String,[Bool])] -> m (Dynamic t ([(String,[Bool])], Event t [(String,[Bool])], Event t Hint)) sequencer' i update = do let iVal = toGenPat $ fromList $ zip [0..] $ fmap (\(x,y)->(Just x,y)) i -- GeneralPattern String @@ -94,7 +94,7 @@ sequencer' i update = do mapDyn (\(v,ev,h) -> (toSequence 0 v, fmap (toSequence 0) $ getChangeValues ev,h)) v where getChangeValues eve = fmapMaybe $ fmap (\x-> case x of ChangeValue a -> Just a; otherwise-> Nothing) eve - +-} sequencer::(Read a, Ord a, MonadWidget t m, Show a, Eq a,T.Parseable a, T.Enumerable a) => Maybe a -> GeneralPattern a -> Event t (EditSignal (Sequence a)) -> m (Dynamic t (GeneralPattern a, Event t (EditSignal (GeneralPattern a)), Event t Hint)) sequencer dflt igp edits = elClass "table" "sequencer" $ mdo diff --git a/static/WebDirt b/static/WebDirt index 59a7778a..00a796b6 160000 --- a/static/WebDirt +++ b/static/WebDirt @@ -1 +1 @@ -Subproject commit 59a7778a5a3de767d2334651a06ba450142c91de +Subproject commit 00a796b60e3340814cf3089360799d14b50b7d77