mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-06-07 00:54:07 +00:00
Code Issues Releases Wiki Activity

Fix TiddlyWeb adaptor to make deleting work

Browse Source
This commit is contained in:
Jeremy Ruston 2013-03-11 10:05:01 +00:00
parent 6b78352764
commit daf3d35180
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/tiddlywiki/tiddlyweb/tiddlyweb.js
View File

@ -63,7 +63,7 @@ Creates a TiddlyWebSyncer object
*/ */
var TiddlyWebSyncer = function(options) { var TiddlyWebSyncer = function(options) {
this.wiki = options.wiki; this.wiki = options.wiki;
// Hashmap of {revision:,changeCount:} // Hashmap of {revision:,bag:,changeCount:}
this.tiddlerInfo = {}; this.tiddlerInfo = {};
var self = this; var self = this;
// Record information for known tiddlers // Record information for known tiddlers
@ -71,6 +71,7 @@ var TiddlyWebSyncer = function(options) {
if(tiddler.fields["revision"]) { if(tiddler.fields["revision"]) {
self.tiddlerInfo[title] = { self.tiddlerInfo[title] = {
revision: tiddler.fields["revision"], revision: tiddler.fields["revision"],
bag: tiddler.fields["bag"],
changeCount: self.wiki.getChangeCount(title) changeCount: self.wiki.getChangeCount(title)
} }
} }
@ -484,8 +485,10 @@ TiddlyWebSyncer.prototype.dispatchTask = function(task,callback) {
} else if(task.type === "delete") { } else if(task.type === "delete") {
// Delete the tiddler // Delete the tiddler
this.log("Dispatching 'delete' task:",task.title); this.log("Dispatching 'delete' task:",task.title);
var bag = this.tiddlerInfo[task.title].bag,
bagFragment = bag ? "bags/" + bag + "/tiddlers/" : "tiddlers/";
this.httpRequest({ this.httpRequest({
url: this.host + this.recipe + "tiddlers/" + task.title, url: this.host + bagFragment + task.title,
type: "DELETE", type: "DELETE",
callback: function(err,data,request) { callback: function(err,data,request) {
if(err) { if(err) {
@ -525,6 +528,7 @@ TiddlyWebSyncer.prototype.storeTiddler = function(tiddlerFields) {
// Save the tiddler revision and changeCount details // Save the tiddler revision and changeCount details
self.tiddlerInfo[result.title] = { self.tiddlerInfo[result.title] = {
revision: tiddlerFields.revision, revision: tiddlerFields.revision,
bag: tiddlerFields.bag,
changeCount: self.wiki.getChangeCount(result.title) changeCount: self.wiki.getChangeCount(result.title)
}; };
}; };