Mirrors/Codiad
2
0
Fork 0
mirror of https://github.com/Codiad/Codiad.git synced 2026-03-14 21:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement more graceful conflict handling

Browse Source
This commit is contained in:
Lorefnon
2012-12-17 19:10:56 +05:30
parent cbdbb96e93
commit efaab54dc6
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
components/filemanager/init.js
View File

@@ -314,15 +314,36 @@
}
}
$.post(this.controller + '?action=modify&path='+path, data, function(resp){
var saveResponse = codiad.jsend.parse(resp);
if (saveResponse != 'error') {
codiad.message.success('File Saved');
}
if (typeof callbacks.success === 'function') {
var context = callbacks.context || _this;
callbacks.success.call(context, saveResponse.mtime);
//var saveResponse = codiad.jsend.parse(resp);
resp = $.parseJSON(resp);
if (resp.status == 'success') {
codiad.message.success('File saved');
if (typeof callbacks.success === 'function'){
var context = callbacks.context || _this;
callbacks.success.call(context, resp.data.mtime);
}
} else {
notifySaveErr();
if (resp.message == 'Client is out of sync'){
var reload = confirm(
"Server has a more updated copy of the file. Would "+
"you like to refresh the contents ? Pressing no will "+
"cause your changes to override the server's copy upon "+
"next save."
);
if (reload) {
codiad.active.close(path);
codiad.active.removeDraft(path);
_this.openFile(path);
} else {
var session = codiad.editor.getActive().getSession();
session.serverMTime = null;
session.untainted = null;
}
} else codiad.message.error('File could not be saved');
if (typeof callbacks.error === 'function') {
var context = callbacks.context || _this;
callbacks.error.apply(context, [resp.data]);
}
}
}).error(notifySaveErr);
},

4
js/jsend.js
View File

@@ -12,7 +12,9 @@
var obj = $.parseJSON(d);
if (obj.status == 'error') {
codiad.message.error(obj.message);
return 'error';
var errMsg = 'error';
errMsg.message = obj.message;
return errMsg;
} else {
return obj.data;
}