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

Fix generateTitle to avoid clashing with shadow tiddlers

Browse Source
This commit is contained in:
Jermolene 2014-02-20 09:58:01 +00:00
parent 88ffb2ad12
commit 2744671211
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/wiki.js
View File

@ -176,7 +176,7 @@ exports.generateNewTitle = function(baseTitle,options) {
options = options || {}; options = options || {};
var c = 0, var c = 0,
title = baseTitle; title = baseTitle;
while(this.tiddlerExists(title)) { while(this.tiddlerExists(title) || this.isShadowTiddler(title)) {
title = baseTitle + title = baseTitle +
(options.prefix || " ") + (options.prefix || " ") +
(++c); (++c);
@ -792,13 +792,17 @@ exports.parseTextReference = function(title,field,index,options) {
// Parse it // Parse it
return this.parseTiddler(title,options); return this.parseTiddler(title,options);
} else { } else {
var tiddler,text; var text;
if(field) { if(field) {
tiddler = this.getTiddler(title); if(field === "title") {
text = title;
} else {
var tiddler = this.getTiddler(title);
if(!tiddler || !tiddler.hasField(field)) { if(!tiddler || !tiddler.hasField(field)) {
return null; return null;
} }
text = tiddler.fields[field]; text = tiddler.fields[field];
}
return this.parseText("text/vnd.tiddlywiki",text.toString(),options); return this.parseText("text/vnd.tiddlywiki",text.toString(),options);
} else if(index) { } else if(index) {
text = this.extractTiddlerDataItem(title,index,""); text = this.extractTiddlerDataItem(title,index,"");