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

Merge pull request #5169 from owncloud/sharingdropdown-uxbugfixes 

Sharing dropdown bug fixes
This commit is contained in:
Morris Jobke 2013-10-07 05:14:14 -07:00
parent 2b3c351601 e97aaee1aa
commit 0d492afee1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/js/share.js
View File

@ -350,7 +350,7 @@ OC.Share={
if (mailSend === '1') {
checked = 'checked';
}
html += '<input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify user by email')+'</label>';
html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify user by email')+'</label>';
}
if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
if (editChecked == '') {
@ -476,7 +476,7 @@ $(document).ready(function() {
$(this).click(function(event) {
var target = $(event.target);
var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon')
&& !target.closest('#ui-datepicker-div').length;
&& !target.closest('#ui-datepicker-div').length && !target.closest('.ui-autocomplete').length;
if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
OC.Share.hideDropDown();
}
@ -502,6 +502,7 @@ $(document).ready(function() {
$(document).on('click', '#dropdown .showCruds', function() {
$(this).parent().find('.cruds').toggle();
return false;
});
$(document).on('click', '#dropdown .unshare', function() {
@ -519,6 +520,7 @@ $(document).ready(function() {
$('#expiration').hide();
}
});
return false;
});
$(document).on('change', '#dropdown .permissions', function() {