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

core/modules/wiki.js

@@ -397,7 +397,7 @@ exports.initParsers = function(moduleType) {
 		}
 	});
 	// 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) {
 		wikitextparser.installRules();
 	}

plugins/tiddlywiki/tiddlyweb/tiddlyweb.js

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

plugins/tiddlywiki/tw2parser/wikitextparser.js

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

tests/wikitests/EighthTiddler.tid

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

tests/wikitests/Fifth Tiddler.tid

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

tests/wikitests/FirstTiddler.tid

@@ -1,4 +1,4 @@
 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/.

tests/wikitests/Fourth Tiddler.tid

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

tests/wikitests/SecondTiddler.tid

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

tests/wikitests/SeventhTiddler.tid

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

tests/wikitests/SixthTiddler.tid

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

tests/wikitests/ThirdTiddler.tid

@@ -1,5 +1,5 @@
 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>>