|
@@ -1449,58 +1449,70 @@
|
|
|
</div>`);
|
|
|
}
|
|
|
|
|
|
+ //Get sort mode from server side
|
|
|
$.ajax({
|
|
|
- url: "../../system/file_system/listDir",
|
|
|
- method: "POST",
|
|
|
- data: {dir: decodeURIComponent(path), sort: sortMode},
|
|
|
+ url: "../../system/file_system/sortMode",
|
|
|
+ data: {opr: "get", folder: currentPath},
|
|
|
success: function(data){
|
|
|
- //Parse the filelist into global variable
|
|
|
- currentFilelist = [];
|
|
|
- if (data === null){
|
|
|
- //There is nothing is this folder.
|
|
|
- $("#folderList").hide();
|
|
|
- $("#fileList").hide();
|
|
|
- return;
|
|
|
+ if (data.error == undefined){
|
|
|
+ sortMode = data;
|
|
|
}
|
|
|
+ $("#sortingMethodSelector").val(sortMode);
|
|
|
+ //Start listdir event
|
|
|
+ $.ajax({
|
|
|
+ url: "../../system/file_system/listDir",
|
|
|
+ method: "POST",
|
|
|
+ data: {dir: decodeURIComponent(path), sort: sortMode},
|
|
|
+ success: function(data){
|
|
|
+ //Parse the filelist into global variable
|
|
|
+ currentFilelist = [];
|
|
|
+ if (data === null){
|
|
|
+ //There is nothing is this folder.
|
|
|
+ $("#folderList").hide();
|
|
|
+ $("#fileList").hide();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- if (data.error !== undefined){
|
|
|
- //Parse path error. Try to refresh the page
|
|
|
- console.log("Path parse error! Redirecting to parent directory.", data.error);
|
|
|
- var pdir = currentPath.split("/");
|
|
|
- pdir.pop(); pdir.pop();
|
|
|
- pdir = pdir.join("/");
|
|
|
- currentPath = pdir;
|
|
|
-
|
|
|
- //Check if it is already rooted and no more parent ahead
|
|
|
- if (currentPath == ""){
|
|
|
- currentPath = "user:/";
|
|
|
- }
|
|
|
-
|
|
|
- //listDirectory(currentPath, function(){
|
|
|
- // window.location.reload();
|
|
|
- //});
|
|
|
- return;
|
|
|
- }else{
|
|
|
- //Filelist returned. Render it
|
|
|
- renderDirectory(data,function(){
|
|
|
- //Restore the selected file list
|
|
|
- $(".fileObject.item").each(function(){
|
|
|
- for (var i = 0; i < selectedFiles.length; i++){
|
|
|
- var thisFilename = selectedFiles[i];
|
|
|
- if (thisFilename == $(this).attr("filename")){
|
|
|
- $(this).addClass("selected");
|
|
|
- }
|
|
|
+ if (data.error !== undefined){
|
|
|
+ //Parse path error. Try to refresh the page
|
|
|
+ console.log("Path parse error! Redirecting to parent directory.", data.error);
|
|
|
+ var pdir = currentPath.split("/");
|
|
|
+ pdir.pop(); pdir.pop();
|
|
|
+ pdir = pdir.join("/");
|
|
|
+ currentPath = pdir;
|
|
|
+
|
|
|
+ //Check if it is already rooted and no more parent ahead
|
|
|
+ if (currentPath == ""){
|
|
|
+ currentPath = "user:/";
|
|
|
}
|
|
|
- });
|
|
|
-
|
|
|
+
|
|
|
+ //listDirectory(currentPath, function(){
|
|
|
+ // window.location.reload();
|
|
|
+ //});
|
|
|
+ return;
|
|
|
+ }else{
|
|
|
+ //Filelist returned. Render it
|
|
|
+ renderDirectory(data,function(){
|
|
|
+ //Restore the selected file list
|
|
|
+ $(".fileObject.item").each(function(){
|
|
|
+ for (var i = 0; i < selectedFiles.length; i++){
|
|
|
+ var thisFilename = selectedFiles[i];
|
|
|
+ if (thisFilename == $(this).attr("filename")){
|
|
|
+ $(this).addClass("selected");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
|
|
|
- //Perform the callback
|
|
|
- if (callback !== undefined){
|
|
|
- callback();
|
|
|
+ //Perform the callback
|
|
|
+ if (callback !== undefined){
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
|
|
@@ -4886,7 +4898,17 @@
|
|
|
function updateSortingMethods(){
|
|
|
var method = $("#sortingMethodSelector").val();
|
|
|
sortMode = method;
|
|
|
- refreshList();
|
|
|
+
|
|
|
+ //Save it to server side
|
|
|
+ $.ajax({
|
|
|
+ url: "../../system/file_system/sortMode",
|
|
|
+ method: "POST",
|
|
|
+ data: {opr: "set", folder: currentPath, mode: sortMode},
|
|
|
+ success: function(data){
|
|
|
+ //console.log("Sort mode saved: " + data)
|
|
|
+ refreshList();
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
function requestCSRFToken(callback){
|