From 6c17169e422db1c1b85f3e6bef0edd4a890ac1a5 Mon Sep 17 00:00:00 2001 From: ilearnit Date: Wed, 12 Sep 2018 14:57:23 +0800 Subject: [PATCH] fix utils --- frontend/src/components/utils.js | 6 +++++- frontend/src/utils/editor-utilties.js | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/utils.js b/frontend/src/components/utils.js index b244082d24..a29aab33e9 100644 --- a/frontend/src/components/utils.js +++ b/frontend/src/components/utils.js @@ -7,9 +7,13 @@ export const keyCodes = { } export function bytesToSize(bytes) { + if (typeof(bytes) == 'undefined') return ' ' + if(bytes < 0) return '--' const sizes = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'] - if (bytes === 0) return bytes + sizes[0] + + if (bytes === 0) return bytes + ' ' + sizes[0] + const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1000)), 10) if (i === 0) return bytes + ' ' + sizes[i] return (bytes / (1000 ** i)).toFixed(1) + ' ' + sizes[i] diff --git a/frontend/src/utils/editor-utilties.js b/frontend/src/utils/editor-utilties.js index 8f1fce2773..76267f281a 100644 --- a/frontend/src/utils/editor-utilties.js +++ b/frontend/src/utils/editor-utilties.js @@ -1,7 +1,6 @@ import { slug, repoID, siteRoot } from '../components/constance'; import { SeafileAPI } from 'seafile-js'; import cookie from 'react-cookies'; -import { bytesToSize } from '../components/utils' let seafileAPI = new SeafileAPI(); let xcsrfHeaders = cookie.load('sfcsrftoken'); @@ -18,7 +17,7 @@ class EditorUtilities { isExpanded: item.type === 'dir' ? true : false, parent_path: item.parent_dir, last_update_time: item.last_update_time, - size: bytesToSize(item.size) + size: item.size } }) return files; @@ -34,7 +33,7 @@ class EditorUtilities { isExpanded: item.type === 'dir' ? true : false, parent_path: item.parent_dir, last_update_time: item.mtime, - size: item.size ? bytesToSize(item.size) : '0 bytes' + size: item.size } })