summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJuan Carlos <juancarlospaco@gmail.com>2021-08-26 18:07:54 -0300
committerGitHub <noreply@github.com>2021-08-26 23:07:54 +0200
commit041edaa1df96fc7963f01bf5048f2bee86b6b363 (patch)
tree386f7d4cfca253762fc456a39ab8d9b3bbf39624
parent98f7254fb25d402a3cad8e7de81207448fc7b322 (diff)
downloadNim-041edaa1df96fc7963f01bf5048f2bee86b6b363.tar.gz
Implement RFC-413 (#18749)
* Implement RFC 413

* Implement RFC 413

* Implement RFC 413

* Implement RFC 413

* https://github.com/nim-lang/Nim/pull/18749#discussion_r696320995

* Update lib/js/dom_extensions.nim

Co-authored-by: konsumlamm <44230978+konsumlamm@users.noreply.github.com>

* Update lib/js/dom_extensions.nim

* https://github.com/nim-lang/Nim/pull/18749#discussion_r696913310

Co-authored-by: konsumlamm <44230978+konsumlamm@users.noreply.github.com>
Co-authored-by: Andreas Rumpf <rumpf_a@web.de>
-rw-r--r--changelog.md3
-rw-r--r--lib/js/dom.nim3
-rw-r--r--lib/js/dom_extensions.nim6
-rw-r--r--tests/effects/tstrict_funcs_imports_js.nim1
4 files changed, 8 insertions, 5 deletions
diff --git a/changelog.md b/changelog.md
index 3ba008cf3..65ae61833 100644
--- a/changelog.md
+++ b/changelog.md
@@ -371,6 +371,9 @@
 
 - Added `dom.setInterval`, `dom.clearInterval` overloads.
 
+- Merged `dom_extensions` module into `dom` module,
+  it was a module with a single line, see https://github.com/nim-lang/RFCs/issues/413
+
 - Allow reading parameters when compiling for Nintendo Switch.
 
 - Deprecated `sequtils.delete` and added an overload taking a `Slice` that raises a defect
diff --git a/lib/js/dom.nim b/lib/js/dom.nim
index 3f0b9f630..aca79faca 100644
--- a/lib/js/dom.nim
+++ b/lib/js/dom.nim
@@ -1771,3 +1771,6 @@ since (1, 3):
     ## https://developer.mozilla.org/en-US/docs/Web/API/FileReader/readAsDataURL
   proc readAsText*(f: FileReader, b: Blob|File, encoding = cstring"UTF-8") {.importcpp: "#.readAsText(#, #)".}
     ## https://developer.mozilla.org/en-US/docs/Web/API/FileReader/readAsText
+
+since (1, 5):
+  proc elementsFromPoint*(n: DocumentOrShadowRoot; x, y: float): seq[Element] {.importcpp.}
diff --git a/lib/js/dom_extensions.nim b/lib/js/dom_extensions.nim
index a1ceff5b4..c15a03195 100644
--- a/lib/js/dom_extensions.nim
+++ b/lib/js/dom_extensions.nim
@@ -1,5 +1,3 @@
 import std/dom
-
-{.push importcpp.}
-proc elementsFromPoint*(n: DocumentOrShadowRoot; x, y: float): seq[Element]
-{.pop.}
+export elementsFromPoint
+{.deprecated: "use `std/dom` instead".}
diff --git a/tests/effects/tstrict_funcs_imports_js.nim b/tests/effects/tstrict_funcs_imports_js.nim
index b7fcd343a..667887ff0 100644
--- a/tests/effects/tstrict_funcs_imports_js.nim
+++ b/tests/effects/tstrict_funcs_imports_js.nim
@@ -7,7 +7,6 @@ discard """
 import
   asyncjs,
   dom,
-  dom_extensions,
   jsconsole,
   jsffi,
   jsre