mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2025-05-20 18:25:21 -04:00
Merge pull request #218 from hoijui/linkifyHeaderStyle
Linkify header style
This commit is contained in:
commit
33150b79c7
5 changed files with 86 additions and 23 deletions
|
@ -3,7 +3,8 @@
|
||||||
"db": {
|
"db": {
|
||||||
"dialect": "sqlite",
|
"dialect": "sqlite",
|
||||||
"storage": ":memory:"
|
"storage": ":memory:"
|
||||||
}
|
},
|
||||||
|
"linkifyHeaderStyle": "gfm"
|
||||||
},
|
},
|
||||||
"development": {
|
"development": {
|
||||||
"loglevel": "debug",
|
"loglevel": "debug",
|
||||||
|
@ -13,7 +14,8 @@
|
||||||
"db": {
|
"db": {
|
||||||
"dialect": "sqlite",
|
"dialect": "sqlite",
|
||||||
"storage": "./db.codimd.sqlite"
|
"storage": "./db.codimd.sqlite"
|
||||||
}
|
},
|
||||||
|
"linkifyHeaderStyle": "gfm"
|
||||||
},
|
},
|
||||||
"production": {
|
"production": {
|
||||||
"domain": "localhost",
|
"domain": "localhost",
|
||||||
|
|
|
@ -158,5 +158,18 @@ module.exports = {
|
||||||
allowGravatar: true,
|
allowGravatar: true,
|
||||||
allowPDFExport: true,
|
allowPDFExport: true,
|
||||||
openID: false,
|
openID: false,
|
||||||
|
// linkifyHeaderStyle - How is a header text converted into a link id.
|
||||||
|
// Header Example: "3.1. Good Morning my Friend! - Do you have 5$?"
|
||||||
|
// * 'keep-case' is the legacy CodiMD value.
|
||||||
|
// Generated id: "31-Good-Morning-my-Friend---Do-you-have-5"
|
||||||
|
// * 'lower-case' is the same like legacy (see above), but converted to lower-case.
|
||||||
|
// Generated id: "#31-good-morning-my-friend---do-you-have-5"
|
||||||
|
// * 'gfm' _GitHub-Flavored Markdown_ style as described here:
|
||||||
|
// https://gist.github.com/asabaylus/3071099#gistcomment-1593627
|
||||||
|
// It works like 'lower-case', but making sure the ID is unique.
|
||||||
|
// This is What GitHub, GitLab and (hopefully) most other tools use.
|
||||||
|
// Generated id: "31-good-morning-my-friend---do-you-have-5"
|
||||||
|
// 2nd appearance: "31-good-morning-my-friend---do-you-have-5-1"
|
||||||
|
// 3rd appearance: "31-good-morning-my-friend---do-you-have-5-2"
|
||||||
linkifyHeaderStyle: 'keep-case'
|
linkifyHeaderStyle: 'keep-case'
|
||||||
}
|
}
|
||||||
|
|
|
@ -134,5 +134,6 @@ module.exports = {
|
||||||
allowEmailRegister: toBooleanConfig(process.env.CMD_ALLOW_EMAIL_REGISTER),
|
allowEmailRegister: toBooleanConfig(process.env.CMD_ALLOW_EMAIL_REGISTER),
|
||||||
allowGravatar: toBooleanConfig(process.env.CMD_ALLOW_GRAVATAR),
|
allowGravatar: toBooleanConfig(process.env.CMD_ALLOW_GRAVATAR),
|
||||||
allowPDFExport: toBooleanConfig(process.env.CMD_ALLOW_PDF_EXPORT),
|
allowPDFExport: toBooleanConfig(process.env.CMD_ALLOW_PDF_EXPORT),
|
||||||
openID: toBooleanConfig(process.env.CMD_OPENID)
|
openID: toBooleanConfig(process.env.CMD_OPENID),
|
||||||
|
linkifyHeaderStyle: process.env.CMD_LINKIFY_HEADER_STYLE
|
||||||
}
|
}
|
||||||
|
|
|
@ -825,6 +825,36 @@ const anchorForId = id => {
|
||||||
return anchor
|
return anchor
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const createHeaderId = (headerContent, headerIds = null) => {
|
||||||
|
// to escape characters not allow in css and humanize
|
||||||
|
const slug = slugifyWithUTF8(headerContent)
|
||||||
|
let id
|
||||||
|
if (window.linkifyHeaderStyle === 'keep-case') {
|
||||||
|
id = slug
|
||||||
|
} else if (window.linkifyHeaderStyle === 'lower-case') {
|
||||||
|
// to make compatible with GitHub, GitLab, Pandoc and many more
|
||||||
|
id = slug.toLowerCase()
|
||||||
|
} else if (window.linkifyHeaderStyle === 'gfm') {
|
||||||
|
// see GitHub implementation reference:
|
||||||
|
// https://gist.github.com/asabaylus/3071099#gistcomment-1593627
|
||||||
|
// it works like 'lower-case', but ...
|
||||||
|
const idBase = slug.toLowerCase()
|
||||||
|
id = idBase
|
||||||
|
if (headerIds !== null) {
|
||||||
|
// ... making sure the id is unique
|
||||||
|
let i = 1
|
||||||
|
while (headerIds.has(id)) {
|
||||||
|
id = idBase + '-' + i
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
headerIds.add(id)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new Error('Unknown linkifyHeaderStyle value "' + window.linkifyHeaderStyle + '"')
|
||||||
|
}
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
const linkifyAnchors = (level, containingElement) => {
|
const linkifyAnchors = (level, containingElement) => {
|
||||||
const headers = containingElement.getElementsByTagName(`h${level}`)
|
const headers = containingElement.getElementsByTagName(`h${level}`)
|
||||||
|
|
||||||
|
@ -832,13 +862,7 @@ const linkifyAnchors = (level, containingElement) => {
|
||||||
let header = headers[i]
|
let header = headers[i]
|
||||||
if (header.getElementsByClassName('anchor').length === 0) {
|
if (header.getElementsByClassName('anchor').length === 0) {
|
||||||
if (typeof header.id === 'undefined' || header.id === '') {
|
if (typeof header.id === 'undefined' || header.id === '') {
|
||||||
// to escape characters not allow in css and humanize
|
header.id = createHeaderId(getHeaderContent(header))
|
||||||
let id = slugifyWithUTF8(getHeaderContent(header))
|
|
||||||
// to make compatible with GitHub, GitLab, Pandoc and many more
|
|
||||||
if (window.linkifyHeaderStyle !== 'keep-case') {
|
|
||||||
id = id.toLowerCase()
|
|
||||||
}
|
|
||||||
header.id = id
|
|
||||||
}
|
}
|
||||||
if (!(typeof header.id === 'undefined' || header.id === '')) {
|
if (!(typeof header.id === 'undefined' || header.id === '')) {
|
||||||
header.insertBefore(anchorForId(header.id), header.firstChild)
|
header.insertBefore(anchorForId(header.id), header.firstChild)
|
||||||
|
@ -864,8 +888,33 @@ function getHeaderContent (header) {
|
||||||
return headerHTML[0].innerHTML
|
return headerHTML[0].innerHTML
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function changeHeaderId ($header, id, newId) {
|
||||||
|
$header.attr('id', newId)
|
||||||
|
const $headerLink = $header.find(`> a.anchor[href="#${id}"]`)
|
||||||
|
$headerLink.attr('href', `#${newId}`)
|
||||||
|
$headerLink.attr('title', newId)
|
||||||
|
}
|
||||||
|
|
||||||
export function deduplicatedHeaderId (view) {
|
export function deduplicatedHeaderId (view) {
|
||||||
|
// headers contained in the last change
|
||||||
const headers = view.find(':header.raw').removeClass('raw').toArray()
|
const headers = view.find(':header.raw').removeClass('raw').toArray()
|
||||||
|
if (headers.length === 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (window.linkifyHeaderStyle === 'gfm') {
|
||||||
|
// consistent with GitHub, GitLab, Pandoc & co.
|
||||||
|
// all headers contained in the document, in order of appearance
|
||||||
|
const allHeaders = view.find(`:header`).toArray()
|
||||||
|
// list of finaly assigned header IDs
|
||||||
|
const headerIds = new Set()
|
||||||
|
for (let j = 0; j < allHeaders.length; j++) {
|
||||||
|
const $header = $(allHeaders[j])
|
||||||
|
const id = $header.attr('id')
|
||||||
|
const newId = createHeaderId(getHeaderContent($header), headerIds)
|
||||||
|
changeHeaderId($header, id, newId)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// the legacy way
|
||||||
for (let i = 0; i < headers.length; i++) {
|
for (let i = 0; i < headers.length; i++) {
|
||||||
const id = $(headers[i]).attr('id')
|
const id = $(headers[i]).attr('id')
|
||||||
if (!id) continue
|
if (!id) continue
|
||||||
|
@ -873,11 +922,9 @@ export function deduplicatedHeaderId (view) {
|
||||||
for (let j = 0; j < duplicatedHeaders.length; j++) {
|
for (let j = 0; j < duplicatedHeaders.length; j++) {
|
||||||
if (duplicatedHeaders[j] !== headers[i]) {
|
if (duplicatedHeaders[j] !== headers[i]) {
|
||||||
const newId = id + j
|
const newId = id + j
|
||||||
const $duplicatedHeader = $(duplicatedHeaders[j])
|
const $header = $(duplicatedHeaders[j])
|
||||||
$duplicatedHeader.attr('id', newId)
|
changeHeaderId($header, id, newId)
|
||||||
const $headerLink = $duplicatedHeader.find(`> a.anchor[href="#${id}"]`)
|
}
|
||||||
$headerLink.attr('href', `#${newId}`)
|
|
||||||
$headerLink.attr('title', newId)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,6 @@ window.version = '<%- version %>'
|
||||||
|
|
||||||
window.allowedUploadMimeTypes = <%- JSON.stringify(allowedUploadMimeTypes) %>
|
window.allowedUploadMimeTypes = <%- JSON.stringify(allowedUploadMimeTypes) %>
|
||||||
|
|
||||||
window.linkifyHeaderStyle = <%- JSON.stringify(linkifyHeaderStyle) %>
|
window.linkifyHeaderStyle = '<%- linkifyHeaderStyle %>'
|
||||||
|
|
||||||
window.DROPBOX_APP_KEY = '<%- DROPBOX_APP_KEY %>'
|
window.DROPBOX_APP_KEY = '<%- DROPBOX_APP_KEY %>'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue