Merge branch 'v1.6.0' into v1.7.0

feat/task1-c-wallet
Devil 2019-09-22 00:59:37 +08:00
commit 08771363c1
3 changed files with 9 additions and 12 deletions

View File

@ -734,10 +734,9 @@
window.event.stopPropagation(); //阻止事件的传播
} finally {
if(!confirm("确定要删除吗?")) return;
$.post(editor.getOpt("serverUrl") + "?action=deletefile", { "id": del.attr("data-id") }, function(responseText) {
json = utils.str2json(responseText);
if (json.state == 'SUCCESS') del.parent().remove();
else alert(json.state);
$.post(editor.getOpt("serverUrl") + "?action=deletefile", { "id": del.attr("data-id") }, function(response) {
if (response.state == 'SUCCESS') del.parent().remove();
else alert(response.state);
});
}
})[0]);

View File

@ -909,10 +909,9 @@
window.event.stopPropagation(); //阻止事件的传播
} finally {
if(!confirm("确定要删除吗?")) return;
$.post(editor.getOpt("serverUrl") + "?action=deletefile", { "id": del.attr("data-id") }, function(responseText) {
json = utils.str2json(responseText);
if (json.state == 'SUCCESS') del.parent().remove();
else alert(json.state);
$.post(editor.getOpt("serverUrl") + "?action=deletefile", { "id": del.attr("data-id") }, function(response) {
if (response.state == 'SUCCESS') del.parent().remove();
else alert(response.state);
});
}
})[0]);

View File

@ -286,10 +286,9 @@
window.event.stopPropagation(); //阻止事件的传播
} finally {
if(!confirm("确定要删除吗?")) return;
$.post(editor.getOpt("serverUrl") + "?action=deletefile", { "id": del.attr("data-id") }, function(responseText) {
json = utils.str2json(responseText);
if (json.state == 'SUCCESS') del.parent().remove();
else alert(json.state);
$.post(editor.getOpt("serverUrl") + "?action=deletefile", { "id": del.attr("data-id") }, function(response) {
if (response.state == 'SUCCESS') del.parent().remove();
else alert(response.state);
});
}
})[0]);