diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 18:23:03 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 18:23:03 +0000 |
| commit | a528f96b842e387f153e4f38d87aebd26ccd39b7 (patch) | |
| tree | 53ac61e053414c84fd7c76cf14521d81df4e15df /core/js/js.js | |
| parent | 927d4c98a14e27b9412a205fb94bab2b94e8978b (diff) | |
| parent | 98f37f4bedd8627e12042422ac05cdf949e7d382 (diff) | |
| download | nextcloud-server-a528f96b842e387f153e4f38d87aebd26ccd39b7.tar.gz nextcloud-server-a528f96b842e387f153e4f38d87aebd26ccd39b7.zip | |
Merge branch 'master' into files_encryption-style-fixes
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/js/js.js b/core/js/js.js index 01e47edf268..6b0c289850c 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -354,7 +354,6 @@ OC.Breadcrumb={ } var crumb=$('<div/>'); crumb.addClass('crumb').addClass('last'); - crumb.attr('style','background-image:url("'+OC.imagePath('core','breadcrumb')+'")'); var crumbLink=$('<a/>'); crumbLink.attr('href',link); @@ -547,7 +546,6 @@ function object(o) { return new F(); } - /** * Fills height of window. (more precise than height: 100%;) */ @@ -624,6 +622,7 @@ $(document).ready(function(){ }); // 'show password' checkbox + $('#password').showPassword(); $('#pass2').showPassword(); //use infield labels @@ -664,14 +663,13 @@ $(document).ready(function(){ event.stopPropagation(); }); $(window).click(function(){//hide the settings menu when clicking outside it - if($('body').attr("id")==="body-user"){ - $('#settings #expanddiv').slideUp(); - } + $('#settings #expanddiv').slideUp(); }); // all the tipsy stuff needs to be here (in reverse order) to work $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); + $('.displayName .action').tipsy({gravity:'se', fade:true, live:true}); $('.password .action').tipsy({gravity:'se', fade:true, live:true}); $('#upload').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); |