diff options
author | Georg Ehrke <developer@georgehrke.com> | 2013-08-29 10:50:55 +0200 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-29 10:50:55 +0200 |
commit | b7758d0f8d52b2f9653cfee549558327c00c8e01 (patch) | |
tree | 309fb713ed25f35f746c59c668521bf9023bc331 /core/js/js.js | |
parent | 70b6e2161ec654f7049027bf6dc5072c1eda4d5e (diff) | |
parent | ea6e74ca9546ca95b3a6372c6106cd8ab2ea2ee9 (diff) | |
download | nextcloud-server-b7758d0f8d52b2f9653cfee549558327c00c8e01.tar.gz nextcloud-server-b7758d0f8d52b2f9653cfee549558327c00c8e01.zip |
Merge master into oc_preview
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}); |