liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: handle link reformatting when not using namespacing + 5 letters locales support (#1165, #1166)

Browse Source
This commit is contained in:
NGPixel 2019-10-31 00:07:37 -04:00
parent 76b97e9f94
commit d78127dc29
1 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
server/modules/rendering/html-core/renderer.js
View File

@ -1,6 +1,8 @@
const _ = require('lodash')
const cheerio = require('cheerio')
const uslug = require('uslug')
const pageHelper = require('../../../helpers/page')
const URL = require('url').URL
/* global WIKI */
@ -23,6 +25,7 @@ module.exports = {
let internalRefs = []
const reservedPrefixes = /^\/[a-z]\//gi
const exactReservedPaths = /^\/[a-z]$/gi
const isHostSet = WIKI.config.host.length > 7 && WIKI.config.host !== 'http://'
if (!isHostSet) {
@ -50,9 +53,11 @@ module.exports = {
}
// -> Check for system prefix
if (!reservedPrefixes.test(href)) {
$(elm).addClass(`is-internal-link`)
if (!reservedPrefixes.test(href) && !exactReservedPaths.test(href)) {
let pagePath = null
// -> Add locale prefix if using namespacing
if (WIKI.config.lang.namespacing) {
// -> Reformat paths
if (href.indexOf('/') !== 0) {
href = `/${this.page.localeCode}/${this.page.path}/${href}`
@ -60,11 +65,32 @@ module.exports = {
href = `/${this.page.localeCode}${href}`
}
try {
const parsedUrl = new URL(`http://x${href}`)
pagePath = pageHelper.parsePath(parsedUrl.pathname)
} catch (err) {
return
}
} else {
// -> Reformat paths
if (href.indexOf('/') !== 0) {
href = `/${this.page.path}/${href}`
}
try {
const parsedUrl = new URL(`http://x${href}`)
pagePath = pageHelper.parsePath(parsedUrl.pathname)
} catch (err) {
return
}
}
// -> Save internal references
internalRefs.push({
localeCode: href.substring(1, 3),
path: _.head(href.substring(4).split('#'))
localeCode: pagePath.locale,
path: pagePath.path
})
$(elm).addClass(`is-internal-link`)
} else {
$(elm).addClass(`is-system-link`)
}
@ -97,12 +123,15 @@ module.exports = {
// -> Apply tag to internal links for found pages
$('a.is-internal-link').each((i, elm) => {
const href = $(elm).attr('href')
const hrefObj = {
localeCode: href.substring(1, 3),
path: _.head(href.substring(4).split('#'))
let hrefObj = {}
try {
const parsedUrl = new URL(`http://x${href}`)
hrefObj = pageHelper.parsePath(parsedUrl.pathname)
} catch (err) {
return
}
if (_.some(results, r => {
return r.localeCode === hrefObj.localeCode && r.path === hrefObj.path
return r.localeCode === hrefObj.locale && r.path === hrefObj.path
})) {
$(elm).addClass(`is-valid-page`)
} else {