gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2022-05-23 09:34:55 +02:00
commit d641a8d2ed
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/bootstrap/styles/application.js
View File

@ -772,8 +772,8 @@ function onAddClipboard(ev) { /* {{{ */
this.size.html(sizeStr);
}
this.setProgress = function(progress) {
var progressBarWidth =progress*this.progressBar.width()/ 100;
this.progressBar.find('div').animate({ width: progressBarWidth }, 10).html(progress + "% ");
// var progressBarWidth =progress*this.progressBar.width()/ 100;
this.progressBar.find('div').animate({ width: progress+"%" }, 10).html(progress + "% ");
if(parseInt(progress) >= 100) {
this.abort.hide();
}

1
views/bootstrap4/styles/application.css
View File

@ -174,6 +174,7 @@ div.statusbar div.filesize {
}
div.statusbar div.progress {
margin-bottom: 10px;
line-height: 1rem;
}
div.statusbar a.btn {
margin-bottom: 10px;

4
views/bootstrap4/styles/application.js
View File

@ -803,8 +803,8 @@ function onAddClipboard(ev) { /* {{{ */
this.size.html(sizeStr);
}
this.setProgress = function(progress) {
var progressBarWidth =progress*this.progressBar.width()/ 100;
this.progressBar.find('div').animate({ width: progressBarWidth }, 10).html(progress + "% ");
// var progressBarWidth =progress*this.progressBar.width()/ 100;
this.progressBar.find('div').animate({ width: progress+"%" }, 10).html(progress + "% ");
if(parseInt(progress) >= 100) {
this.abort.hide();
}