mirror of
https://github.com/Kozea/Radicale.git
synced 2025-06-26 16:45:52 +00:00
Rearrange functions to resolve false conflict.
This commit is contained in:
parent
84fd30f357
commit
ffebbf1928
1 changed files with 16 additions and 16 deletions
|
@ -1336,22 +1336,6 @@ function CreateEditCollectionScene(user, password, collection) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Format bytes to human-readable text.
|
|
||||||
*
|
|
||||||
* @param bytes Number of bytes.
|
|
||||||
*
|
|
||||||
* @return Formatted string.
|
|
||||||
*/
|
|
||||||
function bytesToHumanReadable(bytes, dp=1) {
|
|
||||||
let isNumber = !isNaN(parseFloat(bytes)) && !isNaN(bytes - 0);
|
|
||||||
if(!isNumber){
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
var i = bytes == 0 ? 0 : Math.floor(Math.log(bytes) / Math.log(1024));
|
|
||||||
return (bytes / Math.pow(1024, i)).toFixed(dp) * 1 + ' ' + ['b', 'kb', 'mb', 'gb', 'tb'][i];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removed invalid HREF characters for a collection HREF.
|
* Removed invalid HREF characters for a collection HREF.
|
||||||
*
|
*
|
||||||
|
@ -1386,6 +1370,22 @@ function isValidHREF(href) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format bytes to human-readable text.
|
||||||
|
*
|
||||||
|
* @param bytes Number of bytes.
|
||||||
|
*
|
||||||
|
* @return Formatted string.
|
||||||
|
*/
|
||||||
|
function bytesToHumanReadable(bytes, dp=1) {
|
||||||
|
let isNumber = !isNaN(parseFloat(bytes)) && !isNaN(bytes - 0);
|
||||||
|
if(!isNumber){
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
var i = bytes == 0 ? 0 : Math.floor(Math.log(bytes) / Math.log(1024));
|
||||||
|
return (bytes / Math.pow(1024, i)).toFixed(dp) * 1 + ' ' + ['b', 'kb', 'mb', 'gb', 'tb'][i];
|
||||||
|
}
|
||||||
|
|
||||||
function main() {
|
function main() {
|
||||||
// Hide startup loading message
|
// Hide startup loading message
|
||||||
document.getElementById("loadingscene").classList.add("hidden");
|
document.getElementById("loadingscene").classList.add("hidden");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue