diff --git a/res/include/script/dependencies/util.js b/res/include/script/dependencies/util.js
index 44aa070..ef227ec 100644
--- a/res/include/script/dependencies/util.js
+++ b/res/include/script/dependencies/util.js
@@ -82,3 +82,11 @@ function copyText(text) {
document.body.removeChild(ta); // Remove the textarea
return success;
}
+
+function domainURL() {
+ let url = window.location.protocol+"//"+window.location.hostname;
+ if (window.location.port != "") {
+ url = url+":"+window.location.port;
+ }
+ return url;
+}
diff --git a/res/include/script/file_viewer/DetailsWindow.js b/res/include/script/file_viewer/DetailsWindow.js
index 4f635bd..c31de32 100644
--- a/res/include/script/file_viewer/DetailsWindow.js
+++ b/res/include/script/file_viewer/DetailsWindow.js
@@ -46,46 +46,25 @@ class DetailsWindow {
}
setDetails(file) {let dw = this;
+ let desc = "";
if (dw.viewer.isList) {
- // Lists give incomplete file information, so we have to request
- // more details in the background. File descriptions only exist in
- // lists, so for that we use the data provided in the page source
- fetch(apiEndpoint + "/file/" + file.id + "/info").then(resp => {
- if (!resp.ok) {return;}
- return resp.json();
- }).then(resp => {
- dw.fileID = resp.id;
- dw.divFileDetails.innerHTML = "
"
- + "Name | | " + escapeHTML(resp.name) + " |
"
- + "URL | | /u/" + resp.id + " |
"
- + "Mime Type | | " + escapeHTML(resp.mime_type) + " |
"
- + "ID | | " + resp.id + " |
"
- + "Size | | " + formatDataVolume(resp.size) + " |
"
- + "Bandwidth | | " + formatDataVolume(resp.bandwidth_used) + " |
"
- + "Upload Date | | " + resp.date_upload + " |
"
- + "Description | | " + escapeHTML(file.description) + " |
"
- + "
";
+ desc = file.description;
+ }
+ dw.fileID = file.id;
+ dw.divFileDetails.innerHTML = ""
+ + "Name | | " + escapeHTML(file.name) + " |
"
+ + "URL | | "+domainURL()+"/u/" + file.id + " |
"
+ + "Mime Type | | " + escapeHTML(file.mime_type) + " |
"
+ + "ID | | " + file.id + " |
"
+ + "Size | | " + formatDataVolume(file.size) + " |
"
+ + "Bandwidth | | " + formatDataVolume(file.bandwidth_used) + " |
"
+ + "Upload Date | | " + file.date_upload + " |
"
+ + "Description | | " + escapeHTML(desc) + " |
"
+ + "
";
- dw.viewer.toolbar.setStats(resp.views, resp.bandwidth_used/resp.size);
- if(dw.visible) {
- dw.updateGraph(dw.fileID);
- }
- })
- } else {
- dw.fileID = file.id;
- dw.divFileDetails.innerHTML = ""
- + "Name | | " + escapeHTML(file.name) + " |
"
- + "Mime Type | | " + escapeHTML(file.mime_type) + " |
"
- + "ID | | " + file.id + " |
"
- + "Size | | " + formatDataVolume(file.size) + " |
"
- + "Bandwidth | | " + formatDataVolume(file.bandwidth_used) + " |
"
- + "Upload Date | | " + file.date_upload + " |
"
- + "
";
-
- dw.viewer.toolbar.setStats(file.views, file.bandwidth_used/file.size);
- if(dw.visible) {
- dw.updateGraph(file.id);
- }
+ dw.viewer.toolbar.setStats(file.views, file.bandwidth_used/file.size);
+ if(dw.visible) {
+ dw.updateGraph(file.id);
}
}
diff --git a/res/include/script/homepage.js b/res/include/script/homepage.js
index 8f0d649..df5d158 100644
--- a/res/include/script/homepage.js
+++ b/res/include/script/homepage.js
@@ -87,14 +87,6 @@ function handleUploads(files) {
hideShareButtons();
}
-function domainURL() {
- let url = window.location.protocol+"//"+window.location.hostname;
- if (window.location.port != "") {
- url = url+":"+window.location.port;
- }
- return url;
-}
-
function uploadsFinished() {
shareLink = ""
shareTitle = ""