summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorscambra <sergio@entrecables.com>2012-06-08 14:29:51 +0200
committervirtual <virtual@o-hal.entrecables.com>2012-09-20 08:02:55 +0200
commitaee8949c92b2e0a194e724fabe766be0a273f9b6 (patch)
treee416bd3c1f3c1027f11400c8b49731f06d8738fe /apps
parent518ca0ac58c7cf762d0fc51f75cc886cedd495b0 (diff)
downloadnextcloud-server-aee8949c92b2e0a194e724fabe766be0a273f9b6.tar.gz
nextcloud-server-aee8949c92b2e0a194e724fabe766be0a273f9b6.zip
fix js success callback on safari when uploading files
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/files.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index aefd6f20bec..9f71891abb0 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -361,7 +361,8 @@ $(document).ready(function() {
}
}else{
data.submit().success(function(data, status) {
- response = jQuery.parseJSON(data[0].body.innerText);
+ // in safari data is a string
+ response = jQuery.parseJSON(typeof data === 'string' ? data : data[0].body.innerText);
if(response[0] != undefined && response[0].status == 'success') {
var file=response[0];
delete uploadingFiles[file.name];