diff options
| author | Christoph Wurst <christoph@owncloud.com> | 2016-04-19 15:06:42 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@owncloud.com> | 2016-04-19 15:06:42 +0200 |
| commit | 05d203a989721f3e456ba516ef07be3fd72f460b (patch) | |
| tree | 58073f16f936f8ce3b26ad3db377ecf1e5da085a /core | |
| parent | 37530f27f00a1b284c339d8b8a11563d79ca5757 (diff) | |
| download | nextcloud-server-05d203a989721f3e456ba516ef07be3fd72f460b.tar.gz nextcloud-server-05d203a989721f3e456ba516ef07be3fd72f460b.zip | |
replace $.parseJSON() by JSON.parse()
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/core.json | 2 | ||||
| -rw-r--r-- | core/js/js.js | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/core/js/core.json b/core/js/core.json index 555c683f6f7..670051a4ca4 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -1,7 +1,7 @@ { "vendor": [ "jquery/dist/jquery.min.js", - "jquery-migrate/jquery-migrate.min.js", + "jquery-migrate/jquery-migrate.js", "jquery-ui/ui/jquery-ui.custom.js", "underscore/underscore.js", "moment/min/moment-with-locales.js", diff --git a/core/js/js.js b/core/js/js.js index ce4bf3ee5e9..ac1d582a9f8 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1337,9 +1337,6 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ var item = localStorage.getItem(OC.localStorage.namespace+name); if(item === null) { return null; - } else if (typeof JSON === 'undefined') { - //fallback to jquery for IE6/7/8 - return $.parseJSON(item); } else { return JSON.parse(item); } |