From 9050376fcd3b565b4281a4d1919cd56365eb1e0c Mon Sep 17 00:00:00 2001 From: Keith Cirkel Date: Wed, 29 Jan 2025 09:50:42 +0000 Subject: [PATCH] separate out showModal steps into own algorithm --- source | 64 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/source b/source index 864a982e0de..957cdaf952a 100644 --- a/source +++ b/source @@ -61960,22 +61960,25 @@ interface HTMLDialogElement : HTMLElement {

The showModal() method steps are:

+ data-x="dom-dialog-showModal">showModal() method steps are to show a modal + dialog given this.

+ +

To show a modal dialog given a dialog element subject:

    -

  1. If this has an open attribute and - is modal of this is true, then return.

    2. +

  2. If subject has an open attribute and + is modal of subject is true, then return.

    3. -

  3. If this has an open attribute, then +

  4. If subject has an open attribute, then throw an "InvalidStateError" DOMException.

    5. -

  5. If this's node document is not fully active, then +

  6. If subject's node document is not fully active, then throw an "InvalidStateError" DOMException.

    7. -

  7. If this is not connected, then throw an +

  8. If subject is not connected, then throw an "InvalidStateError" DOMException.

    9. -

  9. If this is in the popover showing +

  10. If subject is in the popover showing state, then throw an "InvalidStateError" DOMException.

    11. @@ -61984,35 +61987,35 @@ interface HTMLDialogElement : HTMLElement { data-x="dom-Event-cancelable">cancelable attribute initialized to true, the oldState attribute initialized to "closed", and the newState - attribute initialized to "open" at this is false, then + attribute initialized to "open" at subject is false, then return.

    -

  11. If this has an open attribute, +

  12. If subject has an open attribute, then return.

    13. -

  13. If this is not connected, then return.

    14. +

  14. If subject is not connected, then return.

    15. -

  15. If this is in the popover showing +

  16. If subject is in the popover showing state, then return.

  17. Queue a dialog toggle event task given subject, "closed", and "open".

    18. -

  18. Add an open attribute to this, whose +

  19. Add an open attribute to subject, whose value is the empty string.

    20. -

  20. Set is modal of this to true.

    21. +

  21. Set is modal of subject to true.

    22. -

  22. Assert: this's node document's open +

  23. Assert: subject's node document's open dialogs list does not contain - this.

    24. + subject.

    -

  24. Add this to this's node document's open +

  25. Add subject to subject's node document's open dialogs list.

  26. -

    Let this's node document be blocked by the modal dialog this.

    +

    Let subject's node document be blocked by the modal dialog subject.

    This will cause the focused area of the document to become inert (unless that currently focused area is a @@ -62022,23 +62025,23 @@ interface HTMLDialogElement : HTMLElement { focus.

    27. -

  27. If this's node document's top layer does not - already contain this, then add an element - to the top layer given this.

    28. +

  28. If subject's node document's top layer does not + already contain subject, then add an element + to the top layer given subject.

    29. -

  29. Set the dialog close watcher with this.

    30. +

  30. Set the dialog close watcher with subject.

    31. -

  31. Set this's previously focused element to the +

  32. Set subject's previously focused element to the focused element.

    33. -

  33. Let document be this's node document.

    34. +

  34. Let document be subject's node document.

  35. Let hideUntil be the result of running topmost popover ancestor - given this, document's showing hint popover list, null, and + given subject, document's showing hint popover list, null, and false.

  36. If hideUntil is null, then set hideUntil to the result of running - topmost popover ancestor given this, document's + topmost popover ancestor given subject, document's showing auto popover list, null, and false.

  37. If hideUntil is null, then set hideUntil to @@ -62047,7 +62050,7 @@ interface HTMLDialogElement : HTMLElement {

  38. Run hide all popovers until given hideUntil, false, and true.

    39. -

  39. Run the dialog focusing steps given this.

    40. +

  40. Run the dialog focusing steps given subject.

To set the dialog close watcher, given a dialog @@ -62061,9 +62064,10 @@ interface HTMLDialogElement : HTMLElement {