aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
diff options
context:
space:
mode:
authorThomas Müller <DeepDiver1975@users.noreply.github.com>2016-04-20 20:38:38 +0200
committerThomas Müller <DeepDiver1975@users.noreply.github.com>2016-04-20 20:38:38 +0200
commit1ab27ddd4aba5cc74a7264b053378f057bacb8b6 (patch)
treed11c2dc58a8e4d8e3926789130f01984d473d8e9 /apps/files/js/file-upload.js
parent1ef92621ab02d94af776a0fa4cd2cffec48589ef (diff)
parente4a8456d0176555e2f27f21b64ac9cbab9ec940a (diff)
downloadnextcloud-server-1ab27ddd4aba5cc74a7264b053378f057bacb8b6.tar.gz
nextcloud-server-1ab27ddd4aba5cc74a7264b053378f057bacb8b6.zip
Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions
migrate deprecated jQuery 1.x functions
Diffstat (limited to 'apps/files/js/file-upload.js')
-rw-r--r--apps/files/js/file-upload.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index fca69064cde..b88a7031dba 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -504,7 +504,7 @@ OC.Upload = {
//fetch response from iframe
response = data.result[0].body.innerText;
}
- var result = $.parseJSON(response);
+ var result = JSON.parse(response);
delete data.jqXHR;