mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-25 01:20:30 +00:00
Code Issues Releases Wiki Activity

Use text/x-tiddlywiki for old format TiddlyWiki text for compatibility

Browse Source
This commit is contained in:
Jeremy Ruston 2012-11-19 16:58:16 +00:00
parent d663368b9c
commit 3d38d4add3
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/wiki.js
View File

@ -397,7 +397,7 @@ exports.initParsers = function(moduleType) {
} }
}); });
// Install the rules for the old wikitext parser rules // Install the rules for the old wikitext parser rules
var wikitextparser = this.parsers["text/vnd.tiddlywiki2"]; var wikitextparser = this.parsers["text/x-tiddlywiki"];
if(wikitextparser) { if(wikitextparser) {
wikitextparser.installRules(); wikitextparser.installRules();
} }

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

@ -469,7 +469,7 @@ TiddlyWebSyncer.prototype.storeTiddler = function(tiddlerFields,revision) {
if(result.type === "text/javascript") { if(result.type === "text/javascript") {
result.type = "application/javascript"; result.type = "application/javascript";
} else if(!result.type || result.type === "None") { } else if(!result.type || result.type === "None") {
result.type = "text/vnd.tiddlywiki2"; result.type = "text/x-tiddlywiki";
} }
// Save the tiddler // Save the tiddler
self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getTiddler(result.title),result)); self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getTiddler(result.title),result));

2
plugins/tiddlywiki/tw2parser/wikitextparser.js
View File

@ -183,6 +183,6 @@ WikiTextParser.prototype.subWikifyTerm = function(output,terminatorRegExp) {
this.output = oldOutput; this.output = oldOutput;
}; };
exports["text/vnd.tiddlywiki2"] = WikiTextParser; exports["text/x-tiddlywiki"] = WikiTextParser;
})(); })();

2
tests/wikitests/EighthTiddler.tid
View File

@ -1,5 +1,5 @@
title: EighthTiddler title: EighthTiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
<<tiddler SixthTiddler>> <<tiddler SixthTiddler>>
<<tiddler target:SixthTiddler>> <<tiddler target:SixthTiddler>>

2
tests/wikitests/Fifth Tiddler.tid
View File

@ -1,5 +1,5 @@
title: Fifth Tiddler title: Fifth Tiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
|A caption above the table|c |A caption above the table|c
| Left | Middle | Right |h | Left | Middle | Right |h

2
tests/wikitests/FirstTiddler.tid
View File

@ -1,4 +1,4 @@
title: FirstTiddler title: FirstTiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
This is the ''text'' of the first tiddler, with a @@font-size:8em;color:red;link@@ to the SecondTiddler, too. And a link to http://tiddlywiki.com/. This is the ''text'' of the first tiddler, with a @@font-size:8em;color:red;link@@ to the SecondTiddler, too. And a link to http://tiddlywiki.com/.

2
tests/wikitests/Fourth Tiddler.tid
View File

@ -1,4 +1,4 @@
title: Fourth Tiddler title: Fourth Tiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
A missing image [img[Something.jpg]] and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot; A missing image [img[Something.jpg]] and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot;

2
tests/wikitests/SecondTiddler.tid
View File

@ -1,5 +1,5 @@
title: SecondTiddler title: SecondTiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
!!Heading !!Heading
This is the second tiddler. It has a list: This is the second tiddler. It has a list:

2
tests/wikitests/SeventhTiddler.tid
View File

@ -1,5 +1,5 @@
title: SeventhTiddler title: SeventhTiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
<<echo {{2+2}}>> <<echo {{2+2}}>>

2
tests/wikitests/SixthTiddler.tid
View File

@ -1,5 +1,5 @@
title: SixthTiddler title: SixthTiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
modified: 20110211110621 modified: 20110211110621
modifier: Jermolene modifier: Jermolene

2
tests/wikitests/ThirdTiddler.tid
View File

@ -1,5 +1,5 @@
title: ThirdTiddler title: ThirdTiddler
type: text/vnd.tiddlywiki2 type: text/x-tiddlywiki
An explicit link [[Fourth Tiddler]] and [[a pretty link|Fourth Tiddler]] and a transclusion <<tiddler [[Fourth Tiddler]] with:Stringy>> An explicit link [[Fourth Tiddler]] and [[a pretty link|Fourth Tiddler]] and a transclusion <<tiddler [[Fourth Tiddler]] with:Stringy>>