mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix toggling of password protection in sharing dropdown

This commit is contained in:
Michael Gapczynski 2012-08-28 15:10:06 -04:00
parent 9338d093f9
commit 9fcb916057
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/css/share.css
View File

@ -15,4 +15,6 @@ a.showCruds { display:inline; opacity:.5; }
a.showCruds:hover { opacity:1; } a.showCruds:hover { opacity:1; }
a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opacity:.5; } a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opacity:.5; }
a.unshare:hover { opacity:1; } a.unshare:hover { opacity:1; }
#link { border-top:1px solid #ddd; padding-top:0.5em; } #link { border-top:1px solid #ddd; padding-top:0.5em; }
input[type="text"], input[type="password"] { width:90%; }
#linkText, #linkPass { display:none; }

11
core/js/share.js
View File

@ -130,7 +130,7 @@ OC.Share={
html += '<br />'; html += '<br />';
} }
if (possiblePermissions & OC.Share.PERMISSION_SHARE) { if (possiblePermissions & OC.Share.PERMISSION_SHARE) {
html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>'; html += '<input id="shareWith" type="text" placeholder="Share with" />';
html += '<ul id="shareWithList">'; html += '<ul id="shareWithList">';
html += '</ul>'; html += '</ul>';
if (link) { if (link) {
@ -139,8 +139,10 @@ OC.Share={
// TODO Change to lock/unlock icon? // TODO Change to lock/unlock icon?
html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>'; html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
html += '<br />'; html += '<br />';
html += '<input id="linkText" style="display:none; width:90%;" readonly="readonly" />'; html += '<input id="linkText" type="text" readonly="readonly" />';
html += '<input id="linkPassText" type="password" placeholder="Password" style="display:none; width:90%;" />'; html += '<div id="linkPass">';
html += '<input id="linkPassText" type="password" placeholder="Password" />';
html += '</div>'
html += '</div>'; html += '</div>';
} }
html += '</div>'; html += '</div>';
@ -408,8 +410,7 @@ $(document).ready(function() {
}); });
$('#showPassword').live('click', function() { $('#showPassword').live('click', function() {
$('#linkText').after('<br />'); $('#linkPass').toggle('blind');
$('#linkPassText').toggle('blind');
}); });
$('#linkPassText').live('keyup', function(event) { $('#linkPassText').live('keyup', function(event) {