diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:40:06 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:40:06 +0200 |
| commit | 534d93d2d3d549039db2661cdc4b9e939a0abe0d (patch) | |
| tree | 7868026ba14b6558c8e50b601a9a5fa85fdc585b /core/js/share.js | |
| parent | f8563ec5831713b341db1b2cd480328912818607 (diff) | |
| parent | 46f59b165e5bd1908509e8a62b67bf983cfd6224 (diff) | |
| download | nextcloud-server-534d93d2d3d549039db2661cdc4b9e939a0abe0d.tar.gz nextcloud-server-534d93d2d3d549039db2661cdc4b9e939a0abe0d.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
apps/files/index.php
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 763713e7cf2..7342747a15a 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -234,6 +234,7 @@ OC.Share={ // } else { $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) { if (result.status == 'success' && result.data.length > 0) { + $( "#shareWith" ).autocomplete( "option", "autoFocus", true ); response(result.data); } else { // Suggest sharing via email if valid email address @@ -241,6 +242,7 @@ OC.Share={ // if (pattern.test(search.term)) { // response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]); // } else { + $( "#shareWith" ).autocomplete( "option", "autoFocus", false ); response([t('core', 'No people found')]); // } } @@ -432,7 +434,7 @@ OC.Share={ dateFormat : 'dd-mm-yy' }); } -} +}; $(document).ready(function() { @@ -521,7 +523,7 @@ $(document).ready(function() { $(document).on('change', '#dropdown .permissions', function() { if ($(this).attr('name') == 'edit') { - var li = $(this).parent().parent() + var li = $(this).parent().parent(); var checkboxes = $('.permissions', li); var checked = $(this).is(':checked'); // Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck |