From 7498989ebb3ed31e8dc10b4a018cc13eaa7995e3 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Sat, 27 Feb 2016 12:25:48 +0000
Subject: [PATCH] Text-slicer: better support for specifying the output title

Can be specified directly, or taken from a field of the tiddler being
sliced, falling back to a default.
---
 .../text-slicer/modules/commands/slice.js     | 12 +++++---
 .../tiddlywiki/text-slicer/modules/slicer.js  | 30 ++++++++-----------
 .../modules/startup/slicer-message.js         |  4 ++-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/plugins/tiddlywiki/text-slicer/modules/commands/slice.js b/plugins/tiddlywiki/text-slicer/modules/commands/slice.js
index 29db5892a..81346fbbb 100644
--- a/plugins/tiddlywiki/text-slicer/modules/commands/slice.js
+++ b/plugins/tiddlywiki/text-slicer/modules/commands/slice.js
@@ -16,7 +16,7 @@ var widget = require("$:/core/modules/widgets/widget.js");
 
 exports.info = {
 	name: "slice",
-	synchronous: true
+	synchronous: false
 };
 
 var Command = function(params,commander,callback) {
@@ -31,11 +31,15 @@ Command.prototype.execute = function() {
 	}
 	var self = this,
 		wiki = this.commander.wiki,
-		tiddlerTitle = this.params[0],
-		slicer = new $tw.Slicer(wiki,tiddlerTitle);
-	slicer.sliceTiddler(tiddlerTitle)
+		sourceTitle = this.params[0],
+		destTitle = this.params[1],
+		slicer = new $tw.Slicer(wiki,sourceTitle,{
+			destTitle: destTitle
+		});
+	slicer.sliceTiddler()
 	slicer.outputTiddlers();
 	slicer.destroy();
+	$tw.utils.nextTick(this.callback);
 	return null;
 };
 
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicer.js b/plugins/tiddlywiki/text-slicer/modules/slicer.js
index ced19fb50..68ef8bbdc 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicer.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicer.js
@@ -16,9 +16,12 @@ var DOMParser = require("$:/plugins/tiddlywiki/xmldom/dom-parser").DOMParser;
 
 var SLICER_OUTPUT_TITLE = "$:/TextSlicer";
 
-function Slicer(wiki,sourceTitle) {
+function Slicer(wiki,sourceTitle,options) {
+	options = options || {};
 	this.wiki = wiki;
 	this.sourceTitle = sourceTitle;
+	this.sourceTiddler = wiki.getTiddler(this.sourceTitle);
+	this.destTitle = options.destTitle || this.sourceTiddler.fields["doc-split-to"] || ("Sliced up " + this.sourceTitle);
 	this.iframe = null; // Reference to iframe used for HTML parsing
 	this.stopWordList = "the and a of on i".split(" ");
 	this.tiddlers = {};
@@ -126,11 +129,10 @@ Slicer.prototype.getSourceWikiDocument = function(tiddler) {
 };
 
 Slicer.prototype.getSourceDocument = function() {
-	var tiddler = $tw.wiki.getTiddler(this.sourceTitle);
-	if(tiddler.fields.type === "text/html") {
-		return this.getSourceHtmlDocument(tiddler);
+	if(this.sourceTiddler.fields.type === "text/html") {
+		return this.getSourceHtmlDocument(this.sourceTiddler);
 	} else {
-		return this.getSourceWikiDocument(tiddler);
+		return this.getSourceWikiDocument(this.sourceTiddler);
 	}
 };
 
@@ -198,18 +200,12 @@ Slicer.prototype.processNode = function(domNode) {
 };
 
 // Slice a tiddler into individual tiddlers
-Slicer.prototype.sliceTiddler = function(title) {
-	var sourceTiddler = $tw.wiki.getTiddler(this.sourceTitle),
-		sliceTitle,sliceTiddler = {};
-	if(sourceTiddler) {
-		sliceTiddler = $tw.utils.extend({},sourceTiddler.fields);
-	}
-	if(sliceTiddler["doc-santovia-id"]) {
-		sliceTiddler.title = sliceTiddler["doc-santovia-id"];
-		delete sliceTiddler["doc-santovia-id"];
-	} else {
-		sliceTiddler.title = "Sliced up " + title;		
+Slicer.prototype.sliceTiddler = function() {
+	var sliceTitle,sliceTiddler = {};
+	if(this.sourceTiddler) {
+		sliceTiddler = $tw.utils.extend({},this.sourceTiddler.fields);
 	}
+	sliceTiddler.title = this.destTitle;
 	sliceTiddler.text =  "Document sliced at " + (new Date());
 	sliceTiddler.type = "text/vnd.tiddlywiki";
 	sliceTiddler.tags = [];
@@ -217,7 +213,7 @@ Slicer.prototype.sliceTiddler = function(title) {
 	sliceTiddler["toc-type"] = "document";
 	var domNode = this.getSourceDocument();
 	this.parentStack.push({type: "h0", title: this.addTiddler(sliceTiddler)});
-	this.currentTiddler = title;
+	this.currentTiddler = sliceTiddler.title;
 	this.containerStack.push(sliceTiddler.title);
 	this.processNodeList(domNode.childNodes);
 	this.containerStack.pop();
diff --git a/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js b/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js
index 2a38d6a05..4dbf970fb 100644
--- a/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js
+++ b/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js
@@ -21,7 +21,9 @@ exports.synchronous = true;
 // Install the root widget event handlers
 exports.startup = function() {
 	$tw.rootWidget.addEventListener("tm-slice-tiddler",function(event) {
-		var slicer = new $tw.Slicer($tw.wiki,event.param);
+		var slicer = new $tw.Slicer($tw.wiki,event.param,{
+			destTitle: event.paramObject.destTitle
+		});
 		slicer.sliceTiddler(event.param)
 		slicer.outputTiddlers();
 		slicer.destroy();