mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly

This commit is contained in:
Jörn Friedrich Dreyer 2013-03-28 18:50:49 +01:00
parent e31d74037a
commit dac875eb9c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/css/files.css
View File

@ -45,7 +45,11 @@
}
#uploadprogresswrapper { float: right; position: relative; }
#uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
#uploadprogresswrapper #uploadprogressbar {
position:relative; float: right;
margin-left: 12px; width:10em; height:1.5em; top:.4em;
display:inline-block;
}
/* FILE TABLE */

7
apps/files/js/files.js
View File

@ -291,7 +291,7 @@ $(document).ready(function() {
//show cancel button
if(data.dataType !== 'iframe') {
$('#upload input.stop').show();
$('#uploadprogresswrapper input.stop').show();
}
},
/**
@ -305,9 +305,6 @@ $(document).ready(function() {
}
$('#uploadprogressbar').progressbar({value:0});
$('#uploadprogressbar').fadeIn();
if(data.dataType != 'iframe ') {
$('#upload input.stop').show();
}
},
fail: function(e, data) {
if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
@ -382,7 +379,7 @@ $(document).ready(function() {
*/
stop: function(e, data) {
if(data.dataType !== 'iframe') {
$('#upload input.stop').hide();
$('#uploadprogresswrapper input.stop').hide();
}
//IE < 10 does not fire the necessary events for the progress bar.