Aroy/ISO-Share
Aroy/ISO-Share
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

adding sort by size and better error handling

Browse source
This commit is contained in:
Mohammad Naghavi 2016-02-11 19:12:08 +01:00
parent 73ac7fd36d
commit f0f86a479a
4 changed files with 57 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

73
js/main.js
View file

@ -83,6 +83,15 @@ $(document).ready(function () {
filesData.sort(function (fileA, fileB) {
return fileA.name.toLowerCase().localeCompare(fileB.name.toLowerCase());
});
} else if (sortBy === "size") {
console.log("sort by size");
filesData.sort(function (fileA, fileB) {
var sizeA = fileA.rawSize ? fileA.rawSize : Number.MIN_VALUE;
var sizeB = fileB.rawSize ? fileB.rawSize : Number.MIN_VALUE;
return sizeA - sizeB;
});
}
fileListElement.empty();
@ -114,11 +123,19 @@ $(document).ready(function () {
$.ajax({
url: filesBaseUrl + path,
dataType: "json",
success: function (filesData) {
// fix sizes and dates
filesData.map(function (fileData) {
fileData.mtime = new Date(fileData.mtime);
fileData.size = fileData.size ? fileSize(fileData.size) : null;
if (fileData.size) {
fileData.rawSize = fileData.size;
fileData.size = fileSize(fileData.size);
}
return fileData;
});
@ -131,30 +148,38 @@ $(document).ready(function () {
renderFileList(filesData, path);
});
if (history.replaceState) {
// IE10, Firefox, Chrome, etc.
console.log("replaceState", path);
history.replaceState(null, path, '#' + path);
console.log("replaceState", path);
history.replaceState(null, path, '#' + path);
} else {
// IE9, IE8, etc
console.log("change hash", path);
window.location.hash = '#!' + path;
}
isNavigating = false;
},
error: function (jqxhr, textStatus, errorThrown) {
console.log(jqxhr, textStatus, errorThrown);
if(textStatus === "timeout") {
alert("Request to server timed out, retry later!");
} else if(textStatus === "abort") {
alert("Connection to server has been aborted, retry later!");
} else if(textStatus === "parsererror") {
alert("Invalid response from server!");
} else if(jqxhr.status === 404) {
alert("Server cant find this file/directory!");
} else {
// also if(textStatus === "error")
alert("Something went wrong in communication to server, retry later!");
}
history.back();
}
});
}
function sizeOf(bytes) {
if (bytes == 0) {
return "0.00 B";
}
var e = Math.floor(Math.log(bytes) / Math.log(1024));
return (bytes / Math.pow(1024, e)).toFixed(2) + ' ' + ' KMGTP'.charAt(e) + 'B';
}
function fileSize(bytes) {
var exp = Math.log(bytes) / Math.log(1024) | 0;
var value = bytes / Math.pow(1024, exp);
@ -177,13 +202,11 @@ $(document).ready(function () {
navigateTo(startPath);
}
if (history.replaceState) {
window.onpopstate = function () {
if (!isNavigating) {
navigateToUrlLocation();
}
};
}
window.onpopstate = function () {
if (!isNavigating) {
navigateToUrlLocation();
}
};
navigateToUrlLocation();
});