diff --git a/source b/source index af6a646b017..d691684c2d3 100644 --- a/source +++ b/source @@ -101851,106 +101851,92 @@ interface NavigationDestination { -
  • -

    If event's interception - state is not "none":

    +

  • If event's interception + state is "none", then return true.

    • -
      -

    1. Let fromNHE be the current - entry of navigation.

      2. +

    2. Let fromNHE be the current + entry of navigation.

      3. -

    3. Assert: fromNHE is not null.

      4. +

    4. Assert: fromNHE is not null.

      5. -
    5. -

      Set navigation's transition - to a new NavigationTransition created in navigation's - relevant realm, with +

    6. +

      Set navigation's transition + to a new NavigationTransition created in navigation's + relevant realm, with -

      -
      navigation type
      -
      navigationType
      +
      +
      navigation type
      +
      navigationType
      -
      from entry
      -
      fromNHE
      +
      from entry
      +
      fromNHE
      -
      destination
      -
      event's destination
      +
      destination
      +
      event's destination
      -
      committed promise
      -
      a new promise created in navigation's relevant realm
      +
      committed promise
      +
      a new promise created in navigation's relevant realm
      -
      finished promise
      -
      a new promise created in navigation's relevant realm
      -
      -
      7. +
      finished promise
      +
      a new promise created in navigation's relevant realm
      + + -
    7. -

      Mark as handled navigation's transition's finished promise.

      +
    8. +

      Mark as handled navigation's transition's finished promise.

      -

      See the discussion - about other finished promises to understand why this is done.

      -
      9. -

    9. Mark as handled navigation's transition's committed promise.

      10. -
    +

    See the discussion + about other finished promises to understand why this is done.

    +

  • Mark as handled navigation's transition's committed promise.

  • If event's navigation precommit handler - list is empty then commit event given apiMethodTracker.

    • - -
  • -

    Otherwise:

    - -
      -

    1. Let precommitController be a new NavigationPrecommitController - created in navigation's relevant realm, - whose event is - event.

      2. - -

    2. Let precommitPromisesList be an empty list.

      3. - -
    3. -

      For each handler of event's navigation precommit handler - list:

      + list is empty, then commit event given apiMethodTracker and + return false.

      4. -
        -

      1. Append the result of invoking handler with - « precommitController » to precommitPromisesList.

        2. -
      - +

    4. Let precommitController be a new NavigationPrecommitController + created in navigation's relevant realm, + whose event is + event.

      5. -

    5. Wait for all precommitPromisesList with the following success - steps: commit event given - apiMethodTracker, and the following failure step given reason: - process navigate event handler failure given event and - reason.

      6. -
    -
    • +

  • Let precommitPromisesList be an empty list.

    • -

  • If event's interception - state is "none", then return true.

    • +

  • For each handler of event's navigation precommit handler + list, append the result of invoking handler with + « precommitController » to precommitPromisesList.

    • + +

  • Wait for all precommitPromisesList with the following success + steps: commit event given + apiMethodTracker, and the following failure step given reason: + process navigate event handler failure given event and + reason.

  • Return false.

    • -

    To commit a navigate event given a NavigateEvent object +

    To commit an intercepted navigate event given a NavigateEvent object event and a navigation API method tracker apiMethodTracker:

    1. Assert: apiMethodTracker is not null.

      2. +

    2. Assert: event's interception state is "intercepted".

      3. +

    3. Let navigation be event's target.

      4. @@ -101965,12 +101951,6 @@ interface NavigationDestination { controller's signal is aborted, then return.

      -

    4. Let endResultIsSameDocument be true if event's interception state is not "none" or event's destination's is same document is true.

      5. -

    5. Prepare to run script given navigation's relevant settings object.

      @@ -101998,85 +101978,79 @@ interface NavigationDestination {
    -
  • -

    If event's interception - state is not "none":

    -
      -

    1. Set event's interception state to "committed".

      2. - -
    2. -

      Switch on event's navigationType:

      - -
      -
      "push"
      -
      "replace"
      -

      Run the URL and history update steps given event's - relevant global object's associated - Document and event's destination's URL, with serializedData set to event's classic history API state and - historyHandling set to event's navigationType.

      +

    3. Set event's interception state to "committed".

      4. -
      "reload"
      -

      Update the navigation API entries for a same-document navigation given - navigation, navigable's active - session history entry, and "reload".

      +
    4. +

      Switch on event's navigationType:

      -
      "traverse"
      -
      -
        -
      1. -

        Set navigation's suppress normal scroll restoration during ongoing - navigation to true.

        - -

        If event's scroll - behavior was set to "after-transition", then - scroll restoration will happen as part of finishing the relevant NavigateEvent. - Otherwise, there will be no scroll restoration. That is, no navigation which is - intercepted by intercept() goes through - the normal scroll restoration process; scroll restoration for such navigations is either - done manually, by the web developer, or is done after the transition.

        -
        2. +
        +
        "push"
        +
        "replace"
        +

        Run the URL and history update steps given event's + relevant global object's associated + Document and event's destination's URL, with serializedData set to event's classic history API state and + historyHandling set to event's navigationType.

        + +
        "reload"
        +

        Update the navigation API entries for a same-document navigation given + navigation, navigable's active + session history entry, and "reload".

        + +
        "traverse"
        +
        +
          +
        1. +

          Set navigation's suppress normal scroll restoration during ongoing + navigation to true.

          + +

          If event's scroll + behavior was set to "after-transition", then + scroll restoration will happen as part of finishing the relevant NavigateEvent. + Otherwise, there will be no scroll restoration. That is, no navigation which is + intercepted by intercept() goes through + the normal scroll restoration process; scroll restoration for such navigations is either + done manually, by the web developer, or is done after the transition.

          +
          2. -

        2. Let userInvolvement be "none".

          3. +

        3. Let userInvolvement be "none".

          4. -
        4. -

          If event's userInitiated is true, then set - userInvolvement to "activation".

          +
        5. +

          If event's userInitiated is true, then set + userInvolvement to "activation".

          -

          At this point after interception, it is not consequential whether the - activation was a result of browser UI.

          -
          6. +

          At this point after interception, it is not consequential whether the + activation was a result of browser UI.

          + -
        6. -

          Append the following session - history traversal steps to navigable's traversable navigable:

          +
        7. +

          Append the following session + history traversal steps to navigable's traversable navigable:

          -
            -

          1. Resume applying the traverse history step given event's - destination's entry's session history entry's step, - navigable's traversable navigable, and - userInvolvement.

            2. -
          -
          8. +
            +

          1. Resume applying the traverse history step given event's + destination's entry's session history entry's step, + navigable's traversable navigable, and + userInvolvement.

          -
        -
        - -
      +
      5. +
    + +

  • If navigation's transition @@ -102084,66 +102058,60 @@ interface NavigationDestination { data-x="concept-Navigation-transition">transition's committed promise with undefined.

    • -
  • -

    If endResultIsSameDocument is true:

    - -
      -

    1. Let promisesList be an empty list.

      2. +

    2. Let promisesList be an empty list.

      3. -

    3. Append apiMethodTracker's committed promise to - promisesList.

      4. +

    4. Append apiMethodTracker's committed promise to + promisesList.

      5. -
    5. -

      For each handler of event's navigation handler list:

      - -
        -

      1. Append the result of invoking handler with an empty - arguments list to promisesList.

        2. -
      -
      6. +
    6. +

      For each handler of event's navigation handler list:

      -
    7. -

      Wait for all of promisesList, with the following success steps:

      +
        +

      1. Append the result of invoking handler with an empty + arguments list to promisesList.

        2. +
      +
      8. -
        -

      1. If event's relevant global object is not fully - active, then abort these steps.

        2. +
      2. +

        Wait for all of promisesList, with the following success steps:

        -

      3. If event's abort - controller's signal is aborted, then abort these steps.

        4. +
          +

        1. If event's relevant global object is not fully + active, then abort these steps.

          2. -

        2. Assert: event equals navigation's ongoing - navigate event.

          3. +

        3. If event's abort + controller's signal is aborted, then abort these steps.

          4. -

        4. Set navigation's ongoing navigate event to null.

          5. +

        5. Assert: event equals navigation's ongoing + navigate event.

          6. -

        6. Finish event given - true.

          7. +

        7. Set navigation's ongoing navigate event to null.

          8. -

        8. Resolve the finished promise for apiMethodTracker.

          9. +

        9. Finish event given + true.

          10. -

        10. Fire an event named navigatesuccess at navigation.

          11. +

        11. Resolve the finished promise for apiMethodTracker.

          12. -

        12. If navigation's transition is not null, then resolve - navigation's transition's - finished promise with - undefined.

          13. +

        13. Fire an event named navigatesuccess at navigation.

          14. -

        14. Set navigation's transition to null.

          15. -
        +

      4. If navigation's transition is not null, then resolve + navigation's transition's + finished promise with + undefined.

        5. -

        and the following failure step given reason: process navigate event - handler failure given event and reason. - +

      5. Set navigation's transition to null.

      + +

      and the following failure step given reason: process navigate event + handler failure given event and reason.

    8. Clean up