diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-02 07:58:06 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-02 07:58:06 +0200 |
| commit | e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3 (patch) | |
| tree | b7d8d913cdf7f4d1ce42f3027918ad0f5fbe5c3b /core/js/js.js | |
| parent | 8dd93c8c0288a11f04816bea2a58aee661ef9e97 (diff) | |
| parent | f038cb9aea7c9a1513ab14d0df002773b17d5333 (diff) | |
| download | nextcloud-server-e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3.tar.gz nextcloud-server-e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3.zip | |
Merge branch 'master' into clean_up_util
Conflicts:
lib/base.php
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index d580b6113e6..af4a6d6b336 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -709,7 +709,6 @@ $(document).ready(function(){ }); label.hide(); }; - setShowPassword($('#password'), $('label[for=show]')); setShowPassword($('#adminpass'), $('label[for=show]')); setShowPassword($('#pass2'), $('label[for=personal-show]')); setShowPassword($('#dbpass'), $('label[for=dbpassword]')); @@ -762,6 +761,7 @@ $(document).ready(function(){ $('.password .action').tipsy({gravity:'se', fade:true, live:true}); $('#upload').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); + $('a.action.delete').tipsy({gravity:'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); $('td .modified').tipsy({gravity:'s', fade:true, live:true}); |