Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Fixed animated progress bar on app removal

master
Gordon Williams 2020-06-04 12:52:16 +01:00
parent 57d89d3534
commit 08721cbe94
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,3 +22,4 @@ Changed for individual apps are listed in `apps/appname/ChangeLog`
* App description can now be markdown * App description can now be markdown
* Fix `marked is not defined` error (and include in repo, just in case) * Fix `marked is not defined` error (and include in repo, just in case)
* Fix error in 'Install Default Apps' if Flash storage is full enough that erasing takes a while * Fix error in 'Install Default Apps' if Flash storage is full enough that erasing takes a while
* Fixed animated progress bar on app removal

2
js/comms.js
View File

@ -146,7 +146,7 @@ const Comms = {
}, },
removeAllApps : () => { removeAllApps : () => {
console.log("<COMMS> removeAllApps start"); console.log("<COMMS> removeAllApps start");
Progress.show({title:"Removing all apps",progess:"animate",sticky:true}); Progress.show({title:"Removing all apps",percent:"animate",sticky:true});
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
var timeout = 5; var timeout = 5;
function handleResult(result,err) { function handleResult(result,err) {

6
js/ui.js
View File

@ -4,7 +4,7 @@
const Progress = { const Progress = {
domElement : null, // the DOM element domElement : null, // the DOM element
sticky : false, // Progress.show({..., sticky:true}) don't remove until Progress.hide({sticky:true}) sticky : false, // Progress.show({..., sticky:true}) don't remove until Progress.hide({sticky:true})
interval : undefined, // the interval used if Progress.show({progress:"animate"}) interval : undefined, // the interval used if Progress.show({percent:"animate"})
percent : undefined, // the current progress percentage percent : undefined, // the current progress percentage
min : 0, // scaling for percentage min : 0, // scaling for percentage
max : 1, // scaling for percentage max : 1, // scaling for percentage
@ -30,13 +30,13 @@ const Progress = {
clearInterval(Progress.interval); clearInterval(Progress.interval);
Progress.interval = undefined; Progress.interval = undefined;
} }
if (percent == "animate") { if (options.percent == "animate") {
Progress.interval = setInterval(function() { Progress.interval = setInterval(function() {
Progress.percent += 2; Progress.percent += 2;
if (Progress.percent>100) Progress.percent=0; if (Progress.percent>100) Progress.percent=0;
Progress.show({percent:Progress.percent}); Progress.show({percent:Progress.percent});
}, 100); }, 100);
percent = 0; Progress.percent = percent = 0;
} }
let toastcontainer = document.getElementById("toastcontainer"); let toastcontainer = document.getElementById("toastcontainer");