From 36957d3fbe7d522bfb905f0a2ceb22279fd00a5e Mon Sep 17 00:00:00 2001 From: kovacsv Date: Tue, 5 Jul 2022 18:08:53 +0200 Subject: [PATCH] Feature flag for download progress. --- source/website/dialog.js | 6 +++++- source/website/featureset.js | 2 +- source/website/threemodelloaderui.js | 17 ++++++++++++----- website/css/dialogs.css | 24 ++++++++++++++---------- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/source/website/dialog.js b/source/website/dialog.js index c511dd1..3b85ac4 100644 --- a/source/website/dialog.js +++ b/source/website/dialog.js @@ -1,4 +1,5 @@ import { AddDiv, CreateDiv } from '../engine/viewer/domutils.js'; +import { FeatureSet } from './featureset.js'; import { AddSvgIconElement, CreateInlineColorCircle, IsHoverEnabled } from './utils.js'; let currentDialog = null; @@ -144,7 +145,10 @@ export class ProgressDialog extends Dialog contentDiv.classList.add ('ov_progress'); let innerContentDiv = AddDiv (contentDiv, 'ov_progress_inner'); - AddDiv (innerContentDiv, 'ov_progress_img', ''); + let imgDiv = AddDiv (innerContentDiv, 'ov_progress_img', ''); + if (!FeatureSet.DownloadProgress) { + imgDiv.classList.add ('animated'); + } this.textDiv = AddDiv (innerContentDiv, 'ov_progress_text'); this.SetText (text); diff --git a/source/website/featureset.js b/source/website/featureset.js index 1590268..b2be6c6 100644 --- a/source/website/featureset.js +++ b/source/website/featureset.js @@ -1,4 +1,4 @@ export const FeatureSet = { - + DownloadProgress : true }; diff --git a/source/website/threemodelloaderui.js b/source/website/threemodelloaderui.js index 3d561b7..7547e13 100644 --- a/source/website/threemodelloaderui.js +++ b/source/website/threemodelloaderui.js @@ -4,6 +4,7 @@ import { ShowMessageDialog } from './dialogs.js'; import { ButtonDialog, ProgressDialog } from './dialog.js'; import { AddSvgIconElement } from './utils.js'; import { ImportErrorCode } from '../engine/import/importer.js'; +import { FeatureSet } from './featureset.js'; export class ThreeModelLoaderUI { @@ -30,13 +31,19 @@ export class ThreeModelLoaderUI }, onFileListProgress : (current, total) => { progressDialog.SetProgress (null); - progressDialog.SetText ('Loading File ' + (current + 1).toString () + '/' + total.toString ()); + if (FeatureSet.DownloadProgress) { + if (total > 1) { + progressDialog.SetText ('Loading File ' + (current + 1).toString () + '/' + total.toString ()); + } + } }, onFileLoadProgress : (current, total) => { - if (total > 0) { - progressDialog.SetProgress (current / total); - } else { - progressDialog.SetProgress (null); + if (FeatureSet.DownloadProgress) { + if (total > 0) { + progressDialog.SetProgress (current / total); + } else { + progressDialog.SetProgress (null); + } } }, onSelectMainFile : (fileNames, selectFile) => { diff --git a/website/css/dialogs.css b/website/css/dialogs.css index cbc5df5..fccf682 100644 --- a/website/css/dialogs.css +++ b/website/css/dialogs.css @@ -230,16 +230,6 @@ div.ov_progress_inner padding: 20px; } -div.ov_progress div.ov_progress_img svg -{ - width: 80px; - height: 80px; - margin-top: 5px; - margin-bottom: 15px; - display: inline-block; - animation: ov_progress_img_kf 5.0s linear infinite; -} - @keyframes ov_progress_img_kf { 0% { transform: rotate(0deg); @@ -249,6 +239,20 @@ div.ov_progress div.ov_progress_img svg } } +div.ov_progress div.ov_progress_img svg +{ + width: 80px; + height: 80px; + margin-top: 5px; + margin-bottom: 15px; + display: inline-block; +} + +div.ov_progress div.ov_progress_img.animated svg +{ + animation: ov_progress_img_kf 5.0s linear infinite; +} + div.ov_progress div.ov_progress_text { font-size: 19px;