mgetadmin/gohttpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolve

Browse Source
This commit is contained in:
chenwenxiao
2019-02-22 17:23:32 +08:00
parent eaa82b8605 c8d67edf2c
commit fdec6aa9ac
3 changed files with 33 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
assets/js/index.js
View File

@@ -251,7 +251,7 @@ var vm = new Vue({
$.ajax({
url: pathJoin(["/", location.pathname, f.name]),
data: {
op: "info",
op: "info",
},
method: "GET",
success: function (res) {
@@ -276,10 +276,7 @@ var vm = new Vue({
return
}
$.ajax({
url: pathJoin(["/", location.pathname, name]),
data: {
op: "mkdir",
},
url: pathJoin(["/", location.pathname, "/", name]),
method: "POST",
success: function (res) {
console.log(res)
@@ -371,10 +368,10 @@ window.onpopstate = function (event) {
function loadFileOrDir(reqPath) {
let requestUri = reqPath + location.search
var retObj = loadFileList(requestUri)
if(retObj !== null) {
retObj.done(function (value) {
window.history.pushState({}, "", requestUri);
});
if (retObj !== null) {
retObj.done(function () {
window.history.pushState({}, "", requestUri);
});
}
}