diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-01-08 15:02:06 -0800 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-01-08 15:02:06 -0800 |
| commit | dae8f15f9fcbba4308c6db8ec3bd78c4aa659fad (patch) | |
| tree | 9d266fd7c3420770a4b519acd8f7edb23fb342a1 /core | |
| parent | b69328e1d1f0888c2541e3f0be27e534f980adb4 (diff) | |
| parent | 7b9e6d2f2ce1503b113017db4dbe43c68da0101b (diff) | |
| download | nextcloud-server-dae8f15f9fcbba4308c6db8ec3bd78c4aa659fad.tar.gz nextcloud-server-dae8f15f9fcbba4308c6db8ec3bd78c4aa659fad.zip | |
Merge pull request #938 from owncloud/fix_minor_files_annoyances
Fix minor files annoyances
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/js/config.js | 2 | ||||
| -rw-r--r-- | core/js/js.js | 13 |
3 files changed, 12 insertions, 5 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 376e3a2f49b..496320561f8 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -56,7 +56,7 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:# /* BUTTONS */ input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; - background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid rgba(180,180,180,.5); cursor:pointer; + background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid #bbb; border:1px solid rgba(180,180,180,.5); cursor:pointer; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } diff --git a/core/js/config.js b/core/js/config.js index f7a29276f7d..563df4e6632 100644 --- a/core/js/config.js +++ b/core/js/config.js @@ -50,6 +50,6 @@ OC.AppConfig={ }, deleteApp:function(app){ OC.AppConfig.postCall('deleteApp',{app:app}); - }, + } }; //TODO OC.Preferences 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}); |