From dac875eb9c99365367f8f1f15da40c7228c466ab Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Thu, 28 Mar 2013 18:50:49 +0100 Subject: '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly --- apps/files/js/files.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'apps/files/js/files.js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index b4f85dc720a..5060fe93f1d 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -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. -- cgit v1.2.3