serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-27 08:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

xr: unbreak following links, they were now being opened in a new window

Browse source 
broken in previous update. the tricky part keeps being about when browsers fire
'load' and 'hashchange' events for the outer and two inner documents. the
previous change attempted to prevent a history item being set on the first
load. that behaviour seems to be kept.
This commit is contained in:
Mechiel Lukkien 2024-02-08 16:25:33 +01:00
parent 4ea9e9e978
commit 39f4800290
No known key found for this signature in database
1 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
rfc/xr.go
View file

@ -252,11 +252,9 @@ body { font-family: 'ubuntu mono', monospace; }
xcheckf(err, "writing rfc line") xcheckf(err, "writing rfc line")
} }
fmt.Fprint(&b, ` fmt.Fprint(&b, `<script>
<script>
for (const a of document.querySelectorAll('a')) { for (const a of document.querySelectorAll('a')) {
a.addEventListener('click', function(e) { a.addEventListener('click', function(e) {
console.log('click', e.target.closest('.l').id)
location.hash = '#'+e.target.closest('.l').id location.hash = '#'+e.target.closest('.l').id
}) })
} }
@ -288,7 +286,8 @@ var indexHTML = `<!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>mox cross-referenced code and RFCs</title> <title>Cross-referenced code and RFCs - Mox</title>
<link rel="icon" href="noNeedlessFaviconRequestsPlease:" />
<style> <style>
body { margin: 0; padding: 0; font-family: 'ubuntu', 'lato', sans-serif; } body { margin: 0; padding: 0; font-family: 'ubuntu', 'lato', sans-serif; }
[title] { text-decoration: underline; text-decoration-style: dotted; } [title] { text-decoration: underline; text-decoration-style: dotted; }
@ -301,11 +300,11 @@ body { margin: 0; padding: 0; font-family: 'ubuntu', 'lato', sans-serif; }
<div style="flex-grow: 1; display: flex; align-items: stretch"> <div style="flex-grow: 1; display: flex; align-items: stretch">
<div style="flex-grow: 1; margin: 1ex; position: relative; display: flex; flex-direction: column"> <div style="flex-grow: 1; margin: 1ex; position: relative; display: flex; flex-direction: column">
<div style="margin-bottom: .5ex"><span id="codefile" style="font-weight: bold">...</span>, <a href="code.html" target="code">index</a></div> <div style="margin-bottom: .5ex"><span id="codefile" style="font-weight: bold">...</span>, <a href="code.html" target="code">index</a></div>
<iframe id="codeiframe" class="iframe"></iframe> <iframe name="code" id="codeiframe" class="iframe"></iframe>
</div> </div>
<div style="flex-grow: 1; margin: 1ex; position: relative; display: flex; flex-direction: column"> <div style="flex-grow: 1; margin: 1ex; position: relative; display: flex; flex-direction: column">
<div style="margin-bottom: .5ex"><span id="rfcfile" style="font-weight: bold">...</span>, <a href="rfc.html" target="rfc">index</a></div> <div style="margin-bottom: .5ex"><span id="rfcfile" style="font-weight: bold">...</span>, <a href="rfc.html" target="rfc">index</a></div>
<iframe id="rfciframe" clsas="iframe"></iframe> <iframe name="rfc" id="rfciframe" class="iframe"></iframe>
</div> </div>
</div> </div>
</div> </div>
@ -324,6 +323,11 @@ function hashline(s) {
function updateHash() { function updateHash() {
const code = trimDotHTML(codeiframe.contentWindow.location.pathname.substring(basepath.length))+hashline(codeiframe.contentWindow.location.hash) const code = trimDotHTML(codeiframe.contentWindow.location.pathname.substring(basepath.length))+hashline(codeiframe.contentWindow.location.hash)
const rfc = trimDotHTML(rfciframe.contentWindow.location.pathname.substring(basepath.length))+hashline(rfciframe.contentWindow.location.hash) const rfc = trimDotHTML(rfciframe.contentWindow.location.pathname.substring(basepath.length))+hashline(rfciframe.contentWindow.location.hash)
if (!code || !rfc) {
// Safari and Chromium seem to raise hashchanged for the initial load. Skip if one
// of the iframes isn't loaded yet initially.
return
}
codefile.innerText = code codefile.innerText = code
rfcfile.innerText = rfc rfcfile.innerText = rfc
const nhash = '#' + code + ',' + rfc const nhash = '#' + code + ',' + rfc
@ -337,28 +341,6 @@ function updateHash() {
changinghash = false changinghash = false
}, 0) }, 0)
} }
codeiframe.addEventListener('load', function(e) {
console.log('codeiframe load', e, codeiframe.src)
if (!rfciframe.src) {
return
}
updateHash()
codeiframe.contentWindow.addEventListener('hashchange', function(e) {
console.log('hash of codeiframe changed', codeiframe.contentWindow.location.hash)
updateHash()
})
})
rfciframe.addEventListener('load', function(e) {
console.log('rfciframe load', e, rfciframe.src)
if (!rfciframe.src) {
return
}
updateHash()
rfciframe.contentWindow.addEventListener('hashchange', function(e) {
console.log('hash of rfciframe changed', rfciframe.contentWindow.location.hash)
updateHash()
})
})
window.addEventListener('hashchange', function() { window.addEventListener('hashchange', function() {
console.log('window hashchange', location.hash, changinghash) console.log('window hashchange', location.hash, changinghash)
if (!changinghash) { if (!changinghash) {
@ -383,8 +365,18 @@ function hashlink2src(s) {
// not. The added entries would break the browser back button... // not. The added entries would break the browser back button...
function replaceIframe(iframe, src) { function replaceIframe(iframe, src) {
const o = iframe const o = iframe
let prevsrc = o ? o.src : undefined
iframe = document.createElement('iframe') iframe = document.createElement('iframe')
iframe.classList.add('iframe') iframe.classList.add('iframe')
iframe.setAttribute('name', o.getAttribute('name'))
iframe.addEventListener('load', function() {
if (prevsrc !== iframe.src && (prevsrc || prevsrc !== 'code.html' && prevsrc !== 'rfc.html')) {
updateHash()
}
iframe.contentWindow.addEventListener('hashchange', function(e) {
updateHash()
})
})
iframe.setAttribute('src', src) iframe.setAttribute('src', src)
o.replaceWith(iframe) o.replaceWith(iframe)
return iframe return iframe