mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-25 14:53:15 +00:00
Code Issues Releases Wiki Activity

Better error trapping for WebDAV saver

Browse Source 
Without these checks we get a startup crash when using TiddlyWiki in
client-server configuration.
This commit is contained in:
Jermolene 2017-02-18 12:12:29 +00:00
parent f0ff1f993e
commit 91b341e8e0
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/modules/savers/put.js
View File

@ -29,7 +29,9 @@ var PutSaver = function(wiki) {
type: "OPTIONS", type: "OPTIONS",
callback: function(err, data, xhr) { callback: function(err, data, xhr) {
// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1 // Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav"); if(!err) {
self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav");
}
} }
}); });
// Retrieve ETag if available // Retrieve ETag if available
@ -37,7 +39,9 @@ var PutSaver = function(wiki) {
url: uri, url: uri,
type: "HEAD", type: "HEAD",
callback: function(err, data, xhr) { callback: function(err, data, xhr) {
self.etag = xhr.getResponseHeader("ETag"); if(!err) {
self.etag = xhr.getResponseHeader("ETag");
}
} }
}); });
}; };
@ -50,12 +54,12 @@ PutSaver.prototype.uri = function() {
// Prompt: Do you want to save over this? Y/N // Prompt: Do you want to save over this? Y/N
// Merging would be ideal, and may be possible using future generic merge flow // Merging would be ideal, and may be possible using future generic merge flow
PutSaver.prototype.save = function(text, method, callback) { PutSaver.prototype.save = function(text, method, callback) {
if (!this.serverAcceptsPuts) { if(!this.serverAcceptsPuts) {
return false; return false;
} }
var self = this; var self = this;
var headers = { "Content-Type": "text/html;charset=UTF-8" }; var headers = { "Content-Type": "text/html;charset=UTF-8" };
if (this.etag) { if(this.etag) {
headers["If-Match"] = this.etag; headers["If-Match"] = this.etag;
} }
$tw.utils.httpRequest({ $tw.utils.httpRequest({
@ -64,15 +68,15 @@ PutSaver.prototype.save = function(text, method, callback) {
headers: headers, headers: headers,
data: text, data: text,
callback: function(err, data, xhr) { callback: function(err, data, xhr) {
if (xhr.status === 200 || xhr.status === 201) { if(err) {
callback(err);
} if(xhr.status === 200 || xhr.status === 201) {
self.etag = xhr.getResponseHeader("ETag"); self.etag = xhr.getResponseHeader("ETag");
callback(null); // success callback(null); // success
} } else if(xhr.status === 412) { // edit conflict
else if (xhr.status === 412) { // edit conflict
var message = $tw.language.getString("Error/EditConflict"); var message = $tw.language.getString("Error/EditConflict");
callback(message); callback(message);
} } else {
else {
callback(xhr.responseText); // fail callback(xhr.responseText); // fail
} }
} }