summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-07-04 21:13:14 +0200
committerGitHub2018-07-04 21:13:14 +0200
commitaf26992b55967e2ef4092453a774cfe046995edc (patch)
tree89f550e38809f61e5a1268f44bc6935fbc2d0700
parentb1d1f469de7d5df8b58c9dee94b23c1cf7527b91 (diff)
parentdf05bff82a32dc2f535cd72f4624006bdc10f904 (diff)
Merge pull request #886 from SISheogorath/fix/ToCHeader
Refactor generation of ToC
Diffstat (limited to '')
-rw-r--r--public/css/extra.css4
-rw-r--r--public/vendor/md-toc.js112
2 files changed, 70 insertions, 46 deletions
diff --git a/public/css/extra.css b/public/css/extra.css
index 1b132901..3954c046 100644
--- a/public/css/extra.css
+++ b/public/css/extra.css
@@ -93,6 +93,10 @@
color: #777;
}
+.toc .invisable-node {
+ list-style-type: none;
+}
+
.ui-toc {
position: fixed;
bottom: 20px;
diff --git a/public/vendor/md-toc.js b/public/vendor/md-toc.js
index 3457d465..876978f7 100644
--- a/public/vendor/md-toc.js
+++ b/public/vendor/md-toc.js
@@ -28,7 +28,7 @@
Toc.prototype._collectTitleElements = function () {
this._elTitlesNames = []
this.elTitleElements = []
- for (var i = 1; i < 7; i++) {
+ for (var i = 1; i < 6; i++) {
if (this.el.getElementsByTagName('h' + i).length) {
this._elTitlesNames.push('h' + i)
}
@@ -44,59 +44,79 @@
}
}
- Toc.prototype._createTocContent = function () {
- this._elTitleElementsLen = this.elTitleElements.length
- if (!this._elTitleElementsLen) return
- this.tocContent = ''
- this._tempLists = []
+ Toc.prototype._createTocContent = function recursiveToc(level = 0, titleElements = [], titleNames = [], ulClass = undefined) {
+ // Inititalize our elements from the toc object
+ // which is only available on level 0
+ if (level === 0) {
+ titleElements = this.elTitleElements
+ titleNames = this._elTitlesNames
+ ulClass = this.ulClass
+ }
+ // No need to do anything for an empty ToC
+ if (!titleElements.length) return
- for (var i = 0; i < this._elTitleElementsLen; i++) {
- var j = i + 1
- this._elTitleElement = this.elTitleElements[i]
- this._elTitleElementName = this._elTitleElement.tagName
- this._elTitleElementTitle = this._elTitleElement.textContent.replace(/"/g, '&quot;')
- this._elTitleElementText = (typeof this.process === 'function' ? this.process(this._elTitleElement) : this._elTitleElement.innerHTML).replace(/<(?:.|\n)*?>/gm, '')
- var id = this._elTitleElement.getAttribute('id')
- if (!id) {
- this._elTitleElement.setAttribute('id', 'tip' + i)
- id = '#tip' + i
- } else {
- id = '#' + id
- }
+ var content = '<ul'
+ if (ulClass) {
+ content += ' class="' + ulClass + '"'
+ }
+ content += '>\n'
+ var iterTag = titleNames[level]
+ var recurse = false
+ var openTag = false
- this.tocContent += '<li><a href="' + id + '" title="'+ this._elTitleElementTitle +'">' + this._elTitleElementText + '</a>'
+ for (var element; element = titleElements.shift();) {
+ var elementTag = element.tagName.toLowerCase()
- if (j !== this._elTitleElementsLen) {
- this._elNextTitleElementName = this.elTitleElements[j].tagName
- if (this._elTitleElementName !== this._elNextTitleElementName) {
- var checkColse = false
- var y = 1
- for (var t = this._tempLists.length - 1; t >= 0; t--) {
- if (this._tempLists[t].tagName === this._elNextTitleElementName) {
- checkColse = true
- break
- }
- y++
- }
- if (checkColse) {
- this.tocContent += new Array(y + 1).join('</li></ul>')
- this._tempLists.length = this._tempLists.length - y
- } else {
- this._tempLists.push(this._elTitleElement)
- if (this.ulClass) { this.tocContent += '<ul class="' + this.ulClass + '">' } else { this.tocContent += '<ul>' }
- }
+ // We only care about tags on our level to add them as list item
+ if (elementTag == iterTag) {
+ // Let's do some cleaning
+ var elementTitle = element.textContent.replace(/"/g, '&quot;')
+ var elementText = (typeof this.process === 'function' ? this.process(element) : element.innerHTML).replace(/<(?:.|\n)*?>/gm, '')
+ var id = element.getAttribute('id')
+ if (!id) {
+ element.setAttribute('id', 'tip' + i)
+ id = '#tip' + i
} else {
- this.tocContent += '</li>'
+ id = '#' + id
}
- } else {
- if (this._tempLists.length) {
- this.tocContent += new Array(this._tempLists.length + 1).join('</li></ul>')
- } else {
- this.tocContent += '</li>'
+ if (openTag) {
+ content += '</li>\n'
+ openTag = false
+ }
+ content += '<li><a href="' + id + '" title="'+ elementTitle +'">' + elementText + '</a>'
+ // Reset recursion. We need it for the next subsections
+ recurse = false
+ openTag = true
+ // Check if the current element has a lower level than ours, if so, we have to go down the rabbithole!
+ } else if (!recurse && titleNames.indexOf(elementTag.toLowerCase()) > level) {
+ recurse = true
+ if (!openTag) {
+ content += '<li class="invisable-node">'
+ openTag = true
}
+ // This element is for the lower lever, we have to re-add it before we send the list down there.
+ titleElements.unshift(element)
+ // Let's call ourself and get to the next level
+ content += recursiveToc(level + 1, titleElements, titleNames, ulClass)
+ } else {
+ // When we end up here, met a higher level element
+ // This is not our business so back into the list with the element and let's end this loop
+ titleElements.unshift(element)
+ break
}
}
- if (this.ulClass) { this.tocContent = '<ul class="' + this.ulClass + '">' + this.tocContent + '</ul>' } else { this.tocContent = '<ul>' + this.tocContent + '</ul>' }
+
+ if (openTag) {
+ content += '</li>\n'
+ }
+ content += '</ul>\n'
+
+ // Set ToC content of the level 0 everything else pass things to the upper level!
+ if (level === 0) {
+ this.tocContent = content
+ } else {
+ return content
+ }
}
Toc.prototype._showToc = function () {