diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-10-07 05:14:14 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-10-07 05:14:14 -0700 |
| commit | 0d492afee1ed6a6c032451181c20fd0b90f3105e (patch) | |
| tree | f062542f83d0c5af3931770f9e4bfb8f273e15eb /core | |
| parent | 2b3c351601ae5fb4e6d6d1cbbf308ae12aced787 (diff) | |
| parent | e97aaee1aac6ab81d404e264b86b65357bda96ac (diff) | |
| download | nextcloud-server-0d492afee1ed6a6c032451181c20fd0b90f3105e.tar.gz nextcloud-server-0d492afee1ed6a6c032451181c20fd0b90f3105e.zip | |
Merge pull request #5169 from owncloud/sharingdropdown-uxbugfixes
Sharing dropdown bug fixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/share.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/js/share.js b/core/js/share.js index 8d14520cd74..b472797b3cd 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -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() { |