diff --git a/Makefile b/Makefile index a2a074c5..36ac511d 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,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/20190111/estuary-client-20190111.zip + curl -o temp.zip -L https://github.com/d0kt0r0/estuary/releases/download/20190111b/estuary-client-20190111b.zip unzip temp.zip rm -rf temp.zip cp -Rf static/samples Estuary.jsexe diff --git a/client/src/Estuary/Types/Samples.hs b/client/src/Estuary/Types/Samples.hs index 376dc3e3..f4468039 100644 --- a/client/src/Estuary/Types/Samples.hs +++ b/client/src/Estuary/Types/Samples.hs @@ -47,7 +47,7 @@ instance JSON SampleMap where showJSON map = JSON.encJSDict $ Map.toList $ unSampleMap $ map defaultSampleMapURL :: JSString -defaultSampleMapURL = "WebDirt/sampleMap.json" +defaultSampleMapURL = "samples/sampleMap.json" loadSampleMapAsync :: (ToJSString url) => url -> (Maybe SampleMap -> IO ()) -> IO () loadSampleMapAsync url onLoad = do @@ -68,10 +68,10 @@ loadSampleMapAsync url onLoad = do -- TODO should this not be connected to webdirt? foreign import javascript safe "var xhr = new XMLHttpRequest(); \n\ - \xhr.open('GET', $1, true); \n\ + \xhr.open('GET', $1, true); \n\ \xhr.responseType = 'text'; \n\ \xhr.onload = function() { $2(xhr.response); }; \n\ \xhr.onabort = function() { $2(null); }; \n\ \xhr.onerror = function() { $2(null); }; \n\ \xhr.send(); " - js_loadSamplesAsync :: JSString -> Callback (JSVal -> IO ()) -> IO () \ No newline at end of file + js_loadSamplesAsync :: JSString -> Callback (JSVal -> IO ()) -> IO () diff --git a/client/stack.yaml b/client/stack.yaml index 0b6c895a..e7c53d05 100644 --- a/client/stack.yaml +++ b/client/stack.yaml @@ -45,7 +45,7 @@ packages: - location: git: https://github.com/d0kt0r0/Punctual.git - commit: d9ebad5f1dbc8b1935522200c1f03f0824c93a72 + commit: a4d274718d54d0b22ef602b300320fa0ba50376a extra-dep: true extra-deps: