diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-31 23:23:10 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-31 23:23:10 +0100 |
| commit | 2af6d74bc1bfb8b3ade363c6e8fbdc1b25a42af2 (patch) | |
| tree | 22b375aec0d4668be834565ed6f2552cf90244f2 /core/js/js.js | |
| parent | 11e88f49391a4a38145670f731d20a1fa66040d4 (diff) | |
| parent | 317261d6dfa2b95234628c6e6649bcb94999552a (diff) | |
| download | nextcloud-server-2af6d74bc1bfb8b3ade363c6e8fbdc1b25a42af2.tar.gz nextcloud-server-2af6d74bc1bfb8b3ade363c6e8fbdc1b25a42af2.zip | |
Merge branch 'master' into fixing-js-errors-public-link-master
Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js index 01e47edf268..9c8cf4aa625 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -672,6 +672,7 @@ $(document).ready(function(){ // 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}); |