depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix client socket on delete event might not delete corresponding history record correctly

Browse source
This commit is contained in:
Wu Cheng-Han 2016-10-14 17:39:52 +08:00
parent 1418b7a801
commit 912063bee4
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
public/js/index.js
View file

@ -57,6 +57,9 @@ var syncScrollToView = syncScroll.syncScrollToView;
var historyModule = require('./history'); var historyModule = require('./history');
var writeHistory = historyModule.writeHistory; var writeHistory = historyModule.writeHistory;
var deleteServerHistory = historyModule.deleteServerHistory; var deleteServerHistory = historyModule.deleteServerHistory;
var getHistory = historyModule.getHistory;
var saveHistory = historyModule.saveHistory;
var removeHistory = historyModule.removeHistory;
var renderer = require('./render'); var renderer = require('./render');
var preventXSS = renderer.preventXSS; var preventXSS = renderer.preventXSS;
@ -2292,9 +2295,17 @@ socket.on('error', function (data) {
location.href = serverurl + "/403"; location.href = serverurl + "/403";
}); });
socket.on('delete', function () { socket.on('delete', function () {
if (personalInfo.login) {
deleteServerHistory(noteid, function (err, data) { deleteServerHistory(noteid, function (err, data) {
if (!err) location.href = serverurl; if (!err) location.href = serverurl;
}); });
} else {
getHistory(function (notehistory) {
var newnotehistory = removeHistory(noteid, notehistory);
saveHistory(newnotehistory);
location.href = serverurl;
});
}
}); });
var retryOnDisconnect = false; var retryOnDisconnect = false;
var retryTimer = null; var retryTimer = null;