mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 18:17:20 +00:00
Code Issues Releases Wiki Activity

Tentative improvements to highlight plugin problems

Browse Source 
We now use highlight.js in raw HTML mode on the server, rather than
trying to use it with the fakedom. This causes problems with fakedoms
inability to get textContent for a node that has been created by
assigning innerHTML. So we extend the fakedom to allow the original
text content to be saved.

See #2778 for discussion.
This commit is contained in:
Jermolene 2017-02-21 13:09:32 +00:00
parent eee18aab40
commit b1ecf81b0c
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/modules/utils/fakedom.js
View File

@ -206,13 +206,29 @@ Object.defineProperty(TW_Element.prototype, "innerHTML", {
set: function(value) { set: function(value) {
this.isRaw = true; this.isRaw = true;
this.rawHTML = value; this.rawHTML = value;
this.rawTextContent = null;
}
});
Object.defineProperty(TW_Element.prototype, "textInnerHTML", {
set: function(value) {
if(this.isRaw) {
this.rawTextContent = value;
} else {
throw "Cannot set textInnerHTML of a non-raw TW_Element";
}
} }
}); });
Object.defineProperty(TW_Element.prototype, "textContent", { Object.defineProperty(TW_Element.prototype, "textContent", {
get: function() { get: function() {
if(this.isRaw) { if(this.isRaw) {
if(this.rawTextContent === null) {
console.log(booboo)
throw "Cannot get textContent on a raw TW_Element"; throw "Cannot get textContent on a raw TW_Element";
} else {
return this.rawTextContent;
}
} else { } else {
var b = []; var b = [];
$tw.utils.each(this.children,function(node) { $tw.utils.each(this.children,function(node) {

12
plugins/tiddlywiki/highlight/highlightblock.js
View File

@ -28,12 +28,16 @@ CodeBlockWidget.prototype.postRender = function() {
language = tiddler.fields.text || ""; language = tiddler.fields.text || "";
} }
if(language) { if(language) {
try {
domNode.className = language.toLowerCase() + " hljs"; domNode.className = language.toLowerCase() + " hljs";
if($tw.browser && !domNode.isTiddlyWikiFakeDom) {
hljs.highlightBlock(domNode); hljs.highlightBlock(domNode);
} catch(err) { } else {
// Can't easily tell if a language is registered or not in the packed version of hightlight.js, var text = domNode.textContent;
// so we silently fail and the codeblock remains unchanged domNode.children[0].innerHTML = hljs.fixMarkup(hljs.highlight(language,text).value);
// If we're using the fakedom then specially save the original raw text
if(domNode.isTiddlyWikiFakeDom) {
domNode.children[0].textInnerHTML = text;
}
} }
} }
}; };