mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

More TiddlyWeb sync tweaks

This commit is contained in:
Jeremy Ruston 2012-11-19 22:14:25 +00:00
parent 49ca83e17d
commit 147fde31b2
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editions/tw5tiddlyweb/wiki/EditMode.tid Normal file
View File

@ -0,0 +1,3 @@
title: $:/EditMode
yes

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

@ -235,24 +235,29 @@ TiddlyWebSyncer.prototype.syncFromServer = function() {
self.log("Error retrieving skinny tiddler list:",err); self.log("Error retrieving skinny tiddler list:",err);
return; return;
} }
// Store the skinny versions of these tiddlers // Process each incoming tiddler
var json = JSON.parse(data), var json = JSON.parse(data);
wasAnyTiddlerStored = false;
for(var t=0; t<json.length; t++) { for(var t=0; t<json.length; t++) {
var tiddlerFields = json[t]; // Get the incoming tiddler fields, and the existing tiddler
// Check if the tiddler is already present and not skinny var tiddlerFields = json[t],
var tiddler = self.wiki.getTiddler(tiddlerFields.title), incomingRevision = tiddlerFields.revision.toString(),
isFat = tiddler && tiddler.fields.text !== undefined; tiddler = self.wiki.getTiddler(tiddlerFields.title),
// Store the tiddler tiddlerInfo = self.tiddlerInfo[tiddlerFields.title],
var wasTiddlerStored = self.storeTiddler(tiddlerFields,tiddlerFields.revision.toString()); currRevision = tiddlerInfo ? tiddlerInfo.revision : null;
// Load the body of the tiddler if it was already fat, and we actually stored something // Ignore the incoming tiddler if it's the same as the revision we've already got
if(isFat && wasTiddlerStored) { if(currRevision !== incomingRevision) {
self.enqueueSyncTask({ // Do a full load if we've already got a fat version of the tiddler
type: "load", if(tiddler && tiddler.fields.text) {
title: tiddlerFields.title // Do a full load of this tiddler
}); self.enqueueSyncTask({
type: "load",
title: tiddlerFields.title
});
} else {
// Load the skinny version of the tiddler
self.storeTiddler(tiddlerFields,incomingRevision);
}
} }
wasAnyTiddlerStored = wasTiddlerStored || wasAnyTiddlerStored;
} }
// Trigger another sync // Trigger another sync
window.setTimeout(function() { window.setTimeout(function() {
@ -449,12 +454,6 @@ Convert a TiddlyWeb JSON tiddler into a TiddlyWiki5 tiddler and save it in the s
TiddlyWebSyncer.prototype.storeTiddler = function(tiddlerFields,revision) { TiddlyWebSyncer.prototype.storeTiddler = function(tiddlerFields,revision) {
var self = this, var self = this,
result = {}; result = {};
// Don't update if we've already got this revision and it's not skinny
var tiddler = this.wiki.getTiddler(tiddlerFields.title),
isCurrentlyFat = !!tiddler && !!tiddler.fields.text;
if(isCurrentlyFat && this.tiddlerInfo[tiddlerFields.title] && this.tiddlerInfo[tiddlerFields.title].revision === revision) {
return false;
}
// Transfer the fields, pulling down the `fields` hashmap // Transfer the fields, pulling down the `fields` hashmap
$tw.utils.each(tiddlerFields,function(element,title,object) { $tw.utils.each(tiddlerFields,function(element,title,object) {
if(title === "fields") { if(title === "fields") {
@ -478,7 +477,6 @@ TiddlyWebSyncer.prototype.storeTiddler = function(tiddlerFields,revision) {
revision: revision, revision: revision,
changeCount: self.wiki.getChangeCount(result.title) changeCount: self.wiki.getChangeCount(result.title)
}; };
return true;
}; };
/* /*