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

deserializertype -> deserializerType

Browse Source
This commit is contained in:
James Welford Anderson 2014-04-09 06:26:01 +09:00
parent 362df18a19
commit 0f07977930
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot/boot.js
View File

@ -376,14 +376,14 @@ $tw.utils.checkVersions = function(versionStringA,versionStringB) {
/* /*
Register file type information Register file type information
options: {flags: flags,deserializertype: deserializertype} options: {flags: flags,deserializerType: deserializerType}
flags:"image" for image types flags:"image" for image types
deserializertype: defaults to type if not specified deserializerType: defaults to type if not specified
*/ */
$tw.utils.registerFileType = function(type,encoding,extension,options) { $tw.utils.registerFileType = function(type,encoding,extension,options) {
options = options || {}; options = options || {};
$tw.config.fileExtensionInfo[extension] = {type: type}; $tw.config.fileExtensionInfo[extension] = {type: type};
$tw.config.contentTypeInfo[type] = {encoding: encoding, extension: extension, flags: options.flags || [], deserializertype: options.deserializertype || type}; $tw.config.contentTypeInfo[type] = {encoding: encoding, extension: extension, flags: options.flags || [], deserializerType: options.deserializerType || type};
}; };
/* /*
@ -1058,7 +1058,7 @@ $tw.Wiki.prototype.deserializeTiddlers = function(type,text,srcFields) {
} }
if(!deserializer && $tw.config.contentTypeInfo[type]) { if(!deserializer && $tw.config.contentTypeInfo[type]) {
// see if this type has a different deserializer registered with it // see if this type has a different deserializer registered with it
type = $tw.config.contentTypeInfo[type].deserializertype; type = $tw.config.contentTypeInfo[type].deserializerType;
deserializer = $tw.Wiki.tiddlerDeserializerModules[type]; deserializer = $tw.Wiki.tiddlerDeserializerModules[type];
} }
if(!deserializer) { if(!deserializer) {
@ -1619,7 +1619,7 @@ $tw.boot.startup = function(options) {
$tw.utils.registerFileType("text/plain","utf8",".txt"); $tw.utils.registerFileType("text/plain","utf8",".txt");
$tw.utils.registerFileType("text/css","utf8",".css"); $tw.utils.registerFileType("text/css","utf8",".css");
$tw.utils.registerFileType("text/html","utf8",".html"); $tw.utils.registerFileType("text/html","utf8",".html");
$tw.utils.registerFileType("application/hta","utf16le",".hta",{deserializertype:"text/html"}); $tw.utils.registerFileType("application/hta","utf16le",".hta",{deserializerType:"text/html"});
$tw.utils.registerFileType("application/javascript","utf8",".js"); $tw.utils.registerFileType("application/javascript","utf8",".js");
$tw.utils.registerFileType("application/json","utf8",".json"); $tw.utils.registerFileType("application/json","utf8",".json");
$tw.utils.registerFileType("application/pdf","base64",".pdf",{flags:["image"]}); $tw.utils.registerFileType("application/pdf","base64",".pdf",{flags:["image"]});