From e1a186b8ac3cf5513e2b6d68e34e5566ab629188 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Tue, 26 Aug 2014 22:41:17 +0100 Subject: [PATCH] Added progress dialog. Early days yet, and for some reason CEF refuses to play the progress animation if I override the styling. Part of #246. --- resources/report/css/style.css | 21 +++++++++++++++++++++ resources/report/js/script.js | 15 +++++++++++++++ resources/report/report.html | 4 ++++ 3 files changed, 40 insertions(+) diff --git a/resources/report/css/style.css b/resources/report/css/style.css index 072fd7f3..2e0146e4 100644 --- a/resources/report/css/style.css +++ b/resources/report/css/style.css @@ -419,3 +419,24 @@ input:valid { box-shadow:0 0 3px 0px rgba(0,0,0,0.5); padding: 2px 5px; } +progress { + /* Reset the default appearance */ + -webkit-appearance: none; + width: 250px; + height: 20px; + display: block; +} + +@-webkit-keyframes indeterminate { + 0% { width: 0% } + 100% { width: 100% } +} + +progress::-webkit-progress-bar { + background-color: #eee; + border-radius: 2px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25) inset; +} +progress::-webkit-progress-value { + -webkit-animation: indeterminate 5s linear 0 infinite alternate; +} \ No newline at end of file diff --git a/resources/report/js/script.js b/resources/report/js/script.js index f11a7070..776ba31e 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -746,7 +746,21 @@ function sortUIElements(pluginNames) { lastCard = card; }); } +function toggleProgressDialog() { + var progressDialog = document.getElementById('progressDialog'); + if (progressDialog.open) { + progressDialog.close(); + } else { + progressDialog.showModal(); + } +} +function updateProgressDialog(message) { + var progressDialog = document.getElementById('progressDialog'); + progressDialog.getElementsByTagName('h1')[0].textContent = message; +} function sortPlugins(evt) { + updateProgressDialog('LOOT Working...'); + toggleProgressDialog(); if (loot.settings.updateMasterlist) { updateMasterlist(evt); } @@ -786,6 +800,7 @@ function sortPlugins(evt) { hideElement(document.getElementById('sortButton')); showElement(document.getElementById('applySortButton')); showElement(document.getElementById('cancelSortButton')); + toggleProgressDialog(); } }).catch(processCefError); } diff --git a/resources/report/report.html b/resources/report/report.html index 79a7f7c0..aaf284ce 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -565,6 +565,10 @@ along with LOOT. If not, see <http://www.gnu.org/licenses/>. + + +

+
\ No newline at end of file