From dcc43df173b766543a1c89d3123eccd1e25b1583 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 19:56:47 -0500 Subject: [PATCH 1/3] Drop Effect wrapper on doctype --- src/Web/DOM/Document.js | 4 +++- src/Web/DOM/Document.purs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Web/DOM/Document.js b/src/Web/DOM/Document.js index 405f97b..5b2d823 100644 --- a/src/Web/DOM/Document.js +++ b/src/Web/DOM/Document.js @@ -12,7 +12,9 @@ export const origin = getEffProp("origin"); export const compatMode = getEffProp("compatMode"); export const characterSet = getEffProp("characterSet"); export const contentType = getEffProp("contentType"); -export const _doctype = getEffProp("doctype"); +export function _doctype(doc) { + return doc["doctype"]; +} export const _documentElement = getEffProp("documentElement"); export function getElementsByTagName(localName) { diff --git a/src/Web/DOM/Document.purs b/src/Web/DOM/Document.purs index 8fbb3d8..8ca8e39 100644 --- a/src/Web/DOM/Document.purs +++ b/src/Web/DOM/Document.purs @@ -89,10 +89,10 @@ foreign import compatMode :: Document -> Effect String foreign import characterSet :: Document -> Effect String foreign import contentType :: Document -> Effect String -doctype :: Document -> Effect (Maybe DocumentType) +doctype :: Document -> Maybe DocumentType doctype = map toMaybe <<< _doctype -foreign import _doctype :: Document -> Effect (Nullable DocumentType) +foreign import _doctype :: Document -> Nullable DocumentType documentElement :: Document -> Effect (Maybe Element) documentElement = map toMaybe <<< _documentElement From 40e2b53e8bdca85347ed1d80f82ec4fb6a0e1056 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 19:58:21 -0500 Subject: [PATCH 2/3] Update Bower dependencies to master or main --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 261cac6..81ad323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Notable changes to this project are documented in this file. The format is based Breaking changes: - Migrate FFI to ES modules (#51 by @JordanMartinez) +- Unwrap returned `Effect` for `doctype` (#52 by @JordanMartinez) New features: From 236c4f72dda2f6db46e2bd57c590579557abe6dc Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 19:59:14 -0500 Subject: [PATCH 3/3] Drop unneeded map now that Effect is gone --- src/Web/DOM/Document.purs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/DOM/Document.purs b/src/Web/DOM/Document.purs index 8ca8e39..981f135 100644 --- a/src/Web/DOM/Document.purs +++ b/src/Web/DOM/Document.purs @@ -90,7 +90,7 @@ foreign import characterSet :: Document -> Effect String foreign import contentType :: Document -> Effect String doctype :: Document -> Maybe DocumentType -doctype = map toMaybe <<< _doctype +doctype = toMaybe <<< _doctype foreign import _doctype :: Document -> Nullable DocumentType