summaryrefslogtreecommitdiffstats
path: root/apps/files/js/files.js
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-03-13 17:38:56 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-03-28 18:20:03 +0100
commit831b7ca803184c5c81dc2798467903ea86277e20 (patch)
tree663b1a5aca7e5e3b00d2f0fa70050ebaba2361b9 /apps/files/js/files.js
parentc1a944a655239ae44af27dfa939a39c703c41cb2 (diff)
downloadnextcloud-server-831b7ca803184c5c81dc2798467903ea86277e20.tar.gz
nextcloud-server-831b7ca803184c5c81dc2798467903ea86277e20.zip
don't update progress bar in ie < 10
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r--apps/files/js/files.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 8c3a0c6bca6..59056ea8719 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -381,9 +381,10 @@ $(document).ready(function() {
* @param data
*/
stop: function(e, data) {
- if(data.dataType != 'iframe ') {
+ if(data.dataType !== 'iframe') {
$('#upload input.stop').hide();
}
+
//IE < 10 does not fire the necessary events for the progress bar.
if($.browser.msie && parseInt($.browser.version) < 10) {
return;
@@ -558,6 +559,7 @@ $(document).ready(function() {
var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
eventSource.listen('progress',function(progress){
+ //IE < 10 does not fire the necessary events for the progress bar.
if($.browser.msie && parseInt($.browser.version) < 10) {
} else {
$('#uploadprogressbar').progressbar('value',progress);