Skip to content

fix(RoundCubeWrapper): don't reload the frame after in-frame navigation #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loxK wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(RoundCubeWrapper): don't reload the frame after in-frame navigation #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/RoundCubeWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ const loading = ref(true)

watch(loading, (value) => emit('updateLoading', value))

const queryString = computed(() => (new URLSearchParams(props.query as Record<string, string>)).toString().replace(/\+/g, '%20'))
const serializeQuery = (query: Record<string, string>) => (new URLSearchParams(query)).toString().replace(/\+/g, '%20')

const queryString = computed(() => serializeQuery(props.query as Record<string, string>))

const requestedLocation = computed(() => {
return props.externalLocation + '/' + (queryString.value ? '?' + queryString.value : '')
Expand All @@ -105,6 +107,11 @@ const iFrameLocation = ref(requestedLocation.value)
* Actual location which in general is different from the src attribute.
*/
const currentLocation = ref(requestedLocation.value)
/**
* Query of the actual location, serialized like queryString so that both
* compare equal whatever encoding, hash or script name RoundCube uses.
*/
const currentQueryString = ref(queryString.value)

const frameId = computed(() => appName + '-frame')

Expand Down Expand Up @@ -165,6 +172,7 @@ const emitLoaded = (iFrame: HTMLIFrameElement) => {
currentLocation.value = iFrameWindow.location.href
const search = iFrameWindow.location.search
const query = Object.fromEntries((new URLSearchParams(search)).entries()) as (Record<string, string>)
currentQueryString.value = serializeQuery(query)
emit('iframeLoaded', {
query,
iFrame,
Expand All @@ -180,7 +188,7 @@ const contentObserver = new MutationObserver((entries) => {
})

watch(queryString, (_value) => {
if (requestedLocation.value !== currentLocation.value) {
if (queryString.value !== currentQueryString.value) {
logger.debug('TRIGGER IFRAME REFRESH', { request: requestedLocation.value, current: currentLocation.value })
loading.value = true
contentObserver.disconnect()
Expand Down
Loading