From 5633460b97eeaab468274801b49764f768dfe56c Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Mon, 9 Jul 2018 12:12:32 +0200 Subject: [PATCH] reset css display at fadein --- res/static/res/script/compiled/home.js | 2 +- res/static/res/typescript/home/home.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/static/res/script/compiled/home.js b/res/static/res/script/compiled/home.js index a7b7fdf..4c689b4 100644 --- a/res/static/res/script/compiled/home.js +++ b/res/static/res/script/compiled/home.js @@ -11,7 +11,7 @@ var UploadProgressBar = /** @class */ (function () { this.uploadDiv.setAttribute("class", "file_button"); this.uploadDiv.innerText = "Queued\n" + this.file.name; this.uploadDivJQ = $(this.uploadDiv); - $("#uploads_queue").append(this.uploadDivJQ.hide().fadeIn('slow')); + $("#uploads_queue").append(this.uploadDivJQ.hide().fadeIn('slow').css("display", "")); } UploadProgressBar.prototype.onProgress = function (progress) { this.uploadDiv.innerText = "Uploading... " + Math.round(progress * 1000) / 10 + "%\n" + this.file.name; diff --git a/res/static/res/typescript/home/home.ts b/res/static/res/typescript/home/home.ts index 53b53aa..8646a96 100644 --- a/res/static/res/typescript/home/home.ts +++ b/res/static/res/typescript/home/home.ts @@ -14,18 +14,18 @@ class UploadProgressBar implements FileUpload { this.queueNum = totalUploads totalUploads++ - this.uploadDiv = document.createElement("a"); - this.uploadDiv.setAttribute("class", "file_button"); + this.uploadDiv = document.createElement("a") + this.uploadDiv.setAttribute("class", "file_button") this.uploadDiv.innerText = "Queued\n" + this.file.name this.uploadDivJQ = $(this.uploadDiv) $("#uploads_queue").append( - this.uploadDivJQ.hide().fadeIn('slow') + this.uploadDivJQ.hide().fadeIn('slow').css("display", "") ) } // Interface stuff - public file: File; + public file: File public name: string public onProgress(progress: number){ this.uploadDiv.innerText = "Uploading... " + Math.round(progress*1000)/10 + "%\n" + this.file.name @@ -36,7 +36,7 @@ class UploadProgressBar implements FileUpload { +'#111 0%, ' +'var(--highlight_color) '+ ((progress*100)) +'%, ' +'#111 '+ ((progress*100)+1) +'%)' - ) + ) } public onFinished(id: string){ finishedUploads[this.queueNum] = id