'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
This commit is contained in:
parent
e31d74037a
commit
dac875eb9c
|
@ -45,7 +45,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#uploadprogresswrapper { float: right; position: relative; }
|
#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 */
|
/* FILE TABLE */
|
||||||
|
|
||||||
|
|
|
@ -291,7 +291,7 @@ $(document).ready(function() {
|
||||||
|
|
||||||
//show cancel button
|
//show cancel button
|
||||||
if(data.dataType !== 'iframe') {
|
if(data.dataType !== 'iframe') {
|
||||||
$('#upload input.stop').show();
|
$('#uploadprogresswrapper input.stop').show();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
|
@ -305,9 +305,6 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
$('#uploadprogressbar').progressbar({value:0});
|
$('#uploadprogressbar').progressbar({value:0});
|
||||||
$('#uploadprogressbar').fadeIn();
|
$('#uploadprogressbar').fadeIn();
|
||||||
if(data.dataType != 'iframe ') {
|
|
||||||
$('#upload input.stop').show();
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
fail: function(e, data) {
|
fail: function(e, data) {
|
||||||
if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
|
if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
|
||||||
|
@ -382,7 +379,7 @@ $(document).ready(function() {
|
||||||
*/
|
*/
|
||||||
stop: function(e, data) {
|
stop: function(e, data) {
|
||||||
if(data.dataType !== 'iframe') {
|
if(data.dataType !== 'iframe') {
|
||||||
$('#upload input.stop').hide();
|
$('#uploadprogresswrapper input.stop').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
//IE < 10 does not fire the necessary events for the progress bar.
|
//IE < 10 does not fire the necessary events for the progress bar.
|
||||||
|
|
Loading…
Reference in New Issue