[Pkg-owncloud-commits] [owncloud] 240/394: Merge pull request #709 from schiesbn/set_passwd_on_enter_and_focusout

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit a5a25eb2a81dc2bc6fe4be8fe6766d7a82989516
Merge: db30d86 a0b3b65
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Dec 18 04:04:37 2012 -0800

    Merge pull request #709 from schiesbn/set_passwd_on_enter_and_focusout
    
    set password for shared links when the user press enter

 core/js/share.js |   31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --cc core/js/share.js
index 59e1115,a121d44..0d4f5d1
--- a/core/js/share.js
+++ b/core/js/share.js
@@@ -338,9 -335,8 +341,10 @@@ OC.Share=
  	hideLink:function() {
  		$('#linkText').hide('blind');
  		$('#showPassword').hide();
+ 		$('#showPassword+label').hide();
  		$('#linkPass').hide();
 +        $('#emailPrivateLink #email').hide();
 +        $('#emailPrivateLink #emailButton').hide();
  	},
  	dirname:function(path) {
  		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git