diff options
author | Matthias Held <ilovemilk@wusa.io> | 2018-09-10 20:30:05 +0300 |
---|---|---|
committer | Matthias Held <ilovemilk@wusa.io> | 2018-09-10 20:30:05 +0300 |
commit | 4dc985ecb291488823a65cf942c0603bb44b6d64 (patch) | |
tree | f13b89cb7498e2346cf93b31015fbbcb347ba4d0 /js | |
parent | 0c15810ee7187e3ef399598e402fa7379f78a4e2 (diff) |
Fix some bugs
Diffstat (limited to 'js')
-rw-r--r-- | js/filelist.js | 1 | ||||
-rw-r--r-- | js/scan.js | 1 | ||||
-rw-r--r-- | js/utils.js | 23 |
3 files changed, 11 insertions, 14 deletions
diff --git a/js/filelist.js b/js/filelist.js index 3c80773..5404ecc 100644 --- a/js/filelist.js +++ b/js/filelist.js @@ -19,6 +19,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ +/* global OC */ (function() { /** @@ -19,6 +19,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ +/* global OC */ (function() { /** diff --git a/js/utils.js b/js/utils.js index 3d71a1a..3978d3f 100644 --- a/js/utils.js +++ b/js/utils.js @@ -19,6 +19,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ +/** global: OC */ (function() { /** @@ -41,20 +42,12 @@ var self = this; var td, tr = $('<tr data-id="' + fileData.id + '" data-sequence="' + fileData.sequence + '"></tr>'), mtime = parseInt(fileData.timestamp, 10) * 1000, - basename, extension, simpleSize, sizeColor; + basename, extension, simpleSize, sizeColor, filename; if (isNaN(mtime)) { mtime = new Date().getTime(); } - // size - if (typeof(fileData.size) !== 'undefined' && fileData.size >= 0) { - simpleSize = humanFileSize(parseInt(fileData.size, 10), true); - sizeColor = Math.round(160-Math.pow((fileData.size/(1024*1024)),2)); - } else { - simpleSize = t('ransomware_detection', 'Pending'); - } - td = $('<td class="selection"></td>'); td.append( '<input id="select-' + this.id + '-' + fileData.id + @@ -74,18 +67,20 @@ filename = fileData.newName } + var nameSpan, innernameSpan; + if (filename !== null) { if (fileData.type === 'file') { if (filename.indexOf('.') === 0) { basename = ''; - extension = name; + extension = filename; } else { basename = filename.substr(0, filename.lastIndexOf('.')); extension = filename.substr(filename.lastIndexOf('.')); } - var nameSpan = $('<span></span>').addClass('name-text'); - var innernameSpan = $('<span></span>').addClass('inner-name-text').text(basename); + nameSpan = $('<span></span>').addClass('name-text'); + innernameSpan = $('<span></span>').addClass('inner-name-text').text(basename); nameSpan.append(innernameSpan); @@ -93,8 +88,8 @@ nameSpan.append($('<span></span>').addClass('extension').text(extension)); } } else { - var nameSpan = $('<span></span>').addClass('name-text'); - var innernameSpan = $('<span></span>').addClass('inner-name-text').text(filename); + nameSpan = $('<span></span>').addClass('name-text'); + innernameSpan = $('<span></span>').addClass('inner-name-text').text(filename); nameSpan.append(innernameSpan); } |