diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-08 12:13:24 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-08 12:13:24 +0200 |
| commit | 053b55721d69a54b8d9460868d9e6f3edc606271 (patch) | |
| tree | 873135b3a47e0ef03abcfdbbcf251b66f37863fc /core/js/share.js | |
| parent | c3286402a846bf874ae78a61880442f8ebfd7ba9 (diff) | |
| parent | 2123ef57d830abe24684b54f9819b75ab780834e (diff) | |
| download | nextcloud-server-053b55721d69a54b8d9460868d9e6f3edc606271.tar.gz nextcloud-server-053b55721d69a54b8d9460868d9e6f3edc606271.zip | |
Merge branch 'master' into fixing-appframework-master
Diffstat (limited to 'core/js/share.js')
| -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() { |