mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-16 10:29:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://Jermolene@github.com/Jermolene/TiddlyWiki5.git

Browse Source
This commit is contained in:
Jeremy Ruston 2019-11-20 09:51:27 +00:00
commit 9cff8eb741
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
core/modules/savers/andtidwiki.js
View File

@ -15,24 +15,50 @@ Handles saving changes via the AndTidWiki Android app
var AndTidWiki = function(wiki) {
};
AndTidWiki.prototype.save = function(text,method,callback) {
// Get the pathname of this document
var pathname = decodeURIComponent(document.location.toString().split("#")[0]);
// Strip the file://
if(pathname.indexOf("file://") === 0) {
pathname = pathname.substr(7);
AndTidWiki.prototype.save = function(text,method,callback,options) {
var filename = options && options.variables ? options.variables.filename : null;
if (method === "download") {
// Support download
if (window.twi.saveDownload) {
try {
window.twi.saveDownload(text,filename);
} catch(err) {
if (err.message === "Method not found") {
window.twi.saveDownload(text);
}
}
} else {
var link = document.createElement("a");
link.setAttribute("href","data:text/plain," + encodeURIComponent(text));
if (filename) {
link.setAttribute("download",filename);
}
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
}
} else if (window.twi.saveWiki) {
// Direct save in Tiddloid
window.twi.saveWiki(text);
} else {
// Get the pathname of this document
var pathname = decodeURIComponent(document.location.toString().split("#")[0]);
// Strip the file://
if(pathname.indexOf("file://") === 0) {
pathname = pathname.substr(7);
}
// Strip any query or location part
var p = pathname.indexOf("?");
if(p !== -1) {
pathname = pathname.substr(0,p);
}
p = pathname.indexOf("#");
if(p !== -1) {
pathname = pathname.substr(0,p);
}
// Save the file
window.twi.saveFile(pathname,text);
}
// Strip any query or location part
var p = pathname.indexOf("?");
if(p !== -1) {
pathname = pathname.substr(0,p);
}
p = pathname.indexOf("#");
if(p !== -1) {
pathname = pathname.substr(0,p);
}
// Save the file
window.twi.saveFile(pathname,text);
// Call the callback
callback(null);
return true;
@ -44,7 +70,7 @@ Information about this saver
AndTidWiki.prototype.info = {
name: "andtidwiki",
priority: 1600,
capabilities: ["save", "autosave"]
capabilities: ["save", "autosave", "download"]
};
/*

2
core/modules/utils/utils.js
View File

@ -280,7 +280,7 @@ exports.formatDateString = function(date,template) {
return $tw.utils.pad(date.getSeconds());
}],
[/^0XXX/, function() {
return $tw.utils.pad(date.getMilliseconds());
return $tw.utils.pad(date.getMilliseconds(),3);
}],
[/^0DD/, function() {
return $tw.utils.pad(date.getDate());