diff options
| author | icewind1991 <icewind1991@gmail.com> | 2012-09-20 02:24:27 -0700 |
|---|---|---|
| committer | icewind1991 <icewind1991@gmail.com> | 2012-09-20 02:24:27 -0700 |
| commit | 4ea128ee43ae63b0e714d7fbd075fac810824d90 (patch) | |
| tree | 94eee8f58b81df4fb193436130ebdd66013f7335 /apps/files/js | |
| parent | b1c60841e8c4719ccc04709eba26714a49f600a1 (diff) | |
| parent | aee8949c92b2e0a194e724fabe766be0a273f9b6 (diff) | |
| download | nextcloud-server-4ea128ee43ae63b0e714d7fbd075fac810824d90.tar.gz nextcloud-server-4ea128ee43ae63b0e714d7fbd075fac810824d90.zip | |
Merge pull request #13 from scambra/safari-fixes
fix js success callback on safari when uploading files
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/files.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 824b04cebb0..ec2f159b4ca 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]; |