blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix percent > 100

Browse source
This commit is contained in:
yflory 2020-10-14 17:53:13 +02:00 committed by ansuz
parent 4985ffae75
commit a9e2ebc72a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
customize.dist/loading.js
View file

@ -310,7 +310,8 @@ button.primary:hover{
var getLi = function (i) {
var check = (i < c || (i === c && data.progress === 100)) ? 'fa-check-square-o'
: 'fa-square-o';
var percent = i < c ? '(100%)' : (i === c ? '('+Math.floor(data.progress)+'%)' : '(0%)');
var p = Math.min(Math.floor(data.progress), 100);
var percent = i < c ? '(100%)' : (i === c ? '('+p+'%)' : '(0%)');
return '<li><i class="fa '+check+'"></i><span>'+Messages['loading_state_'+i]+'</span>' +
'<span>'+percent+'</span>';
};
@ -324,7 +325,8 @@ button.primary:hover{
var makeBar = function (data) {
var c = types.indexOf(data.type);
var l = types.length;
var p = (data.progress / l) + (100 * c / l);
var progress = Math.min(data.progress, 100);
var p = (progress / l) + (100 * c / l);
var bar = '<div class="cp-loading-progress-bar">'+
'<div class="cp-loading-progress-bar-value" style="width:'+p+'%"></div>'+
'</div>';