From e1261581451a8a7566f661ebf0473d8da7e3b228 Mon Sep 17 00:00:00 2001 From: Dom Christie Date: Thu, 21 Sep 2023 21:12:56 +0100 Subject: [PATCH] Fix merge --- src/core/drive/visit.js | 2 +- src/core/session.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/drive/visit.js b/src/core/drive/visit.js index ca1c9adf2..30c99c962 100644 --- a/src/core/drive/visit.js +++ b/src/core/drive/visit.js @@ -72,7 +72,7 @@ export class Visit { updateHistory, shouldCacheSnapshot, acceptsStreamResponse, - direction + direction, initiator } = { ...defaultOptions, diff --git a/src/core/session.js b/src/core/session.js index 77e62779a..fff40cd7c 100644 --- a/src/core/session.js +++ b/src/core/session.js @@ -319,7 +319,7 @@ export class Session { } notifyApplicationAfterVisitingLocation(location, action, direction, target) { - return dispatch("turbo:visit", { detail: { url: location.href, action, direction, target } }) + return dispatch("turbo:visit", { target, detail: { url: location.href, action, direction } }) } notifyApplicationBeforeCachingSnapshot() {