diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 09:53:12 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 09:53:12 +0100 |
| commit | 23896a72906f1dca08d8413ea9a339b5d74aa658 (patch) | |
| tree | 89edfcc629cfe1aac7787448338432875df63bed /core/js/js.js | |
| parent | bae175518427de1f43ac23dbc1e06a15f6933370 (diff) | |
| parent | 60489764f37a6f344fa20e361a26c7a6006f9c97 (diff) | |
| download | nextcloud-server-23896a72906f1dca08d8413ea9a339b5d74aa658.tar.gz nextcloud-server-23896a72906f1dca08d8413ea9a339b5d74aa658.zip | |
Merge branch 'master' into fixing-784-master
Conflicts:
apps/files/js/files.js
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index 610950995db..95889ac8a27 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -343,8 +343,15 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item)); }, getItem:function(name){ - if(localStorage.getItem(OC.localStorage.namespace+name)===null){return null;} - return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name)); + 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); + } } }; }else{ @@ -615,7 +622,7 @@ $(document).ready(function(){ $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); $('.password .action').tipsy({gravity:'se', fade:true, live:true}); - $('#upload a').tipsy({gravity:'w', fade:true}); + $('#upload').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); $('a.delete').tipsy({gravity: 'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); |