mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2026-10-04 23:21:42 +00:00
Code Issues Releases Wiki Activity

Text-slicer: Improvements to image handling

Browse Source
This commit is contained in:
Jermolene
2015-09-17 19:41:41 +01:00
parent 1fef272388
commit e2d63a03b2
9 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiddlywiki/text-slicer/modules/slicer.js
+13 -1
View File
@@ -50,6 +50,18 @@ Slicer.prototype.addToList = function(parent,child) {
this.addTiddler($tw.utils.extend({title: parent},parentTiddler,{list: parentList}));
};
Slicer.prototype.insertBeforeListItem = function(parent,child,beforeSibling) {
var parentTiddler = this.tiddlers[parent] || {},
parentList = parentTiddler.list || [],
parentListSiblingPosition = parentList.indexOf(beforeSibling);
if(parentListSiblingPosition !== -1) {
parentList.splice(parentListSiblingPosition,0,child)
this.addTiddler($tw.utils.extend({title: parent},parentTiddler,{list: parentList}));
}
else {debugger;}
};
Slicer.prototype.popParentStackUntil = function(type) {
// Pop the stack to remove any entries at the same or lower level
var newLevel = this.convertTypeToLevel(type),
@@ -173,7 +185,7 @@ Slicer.prototype.processNode = function(domNode) {
}
}
if(!hasProcessed) {
if(domNode.hasChildNodes()) {
if(nodeType === 1 && domNode.hasChildNodes()) {
this.processNodeList(domNode.childNodes);
}
}
plugins/tiddlywiki/text-slicer/modules/slicers/image.js
+35 -7
View File
@@ -17,14 +17,42 @@ exports.processImageNode = function(domNode,tagName) {
var src = domNode.getAttribute("src");
if(src && src.substr(0,5) === "data:") {
var parts = src.toString().substr(5).split(";base64,"),
type = parts[0],
text = parts[1],
contentTypeInfo = $tw.config.contentTypeInfo[type],
containerTitle = this.getTopContainer(),
title = this.makeUniqueTitle("image",containerTitle);
this.addTiddler({
title: title,
type: parts[0],
text: parts[1]
});
this.appendToCurrentContainer("[img[" + title + "]]");
containerTiddler = this.tiddlers[containerTitle],
title = this.makeUniqueTitle("image",containerTitle) + contentTypeInfo.extension,
tiddler = {
title: title,
type: parts[0],
text: parts[1],
"toc-type": "image"
};
switch(containerTiddler["toc-type"]) {
case "document":
// Make the image be the next child of the document
this.addToList(containerTitle,title);
break;
case "heading":
// Make the image be the older sibling of the heading
var parentTitle = this.parentStack[this.parentStack.length - 2].title;
this.insertBeforeListItem(parentTitle,title,containerTitle);
break;
case "paragraph":
// Make the image be the older sibling of the paragraph
var parentTitle = this.parentStack[this.parentStack.length - 1].title;
this.insertBeforeListItem(parentTitle,title,containerTitle);
break;
case "item":
// Create a new older sibling item to contain the image
var parentTitle = this.parentStack[this.parentStack.length - 1].title;
tiddler["toc-type"] = "item";
this.insertBeforeListItem(parentTitle,title,containerTitle);
break;
}
this.addTiddler(tiddler);
// this.appendToCurrentContainer("[img[" + title + "]]");
}
return true;
}