Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter

Fixes #4465 - Added autoFocus to #shareWith autocomplete options
remotes/origin/stable6
Morris Jobke 11 years ago
commit 58e6582056
  1. 6
      core/js/share.js

@ -233,6 +233,7 @@ OC.Share={
// } else { // } else {
$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) { $.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) { if (result.status == 'success' && result.data.length > 0) {
$( "#shareWith" ).autocomplete( "option", "autoFocus", true );
response(result.data); response(result.data);
} else { } else {
// Suggest sharing via email if valid email address // Suggest sharing via email if valid email address
@ -240,6 +241,7 @@ OC.Share={
// if (pattern.test(search.term)) { // if (pattern.test(search.term)) {
// response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]); // response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
// } else { // } else {
$( "#shareWith" ).autocomplete( "option", "autoFocus", false );
response([t('core', 'No people found')]); response([t('core', 'No people found')]);
// } // }
} }
@ -423,7 +425,7 @@ OC.Share={
dateFormat : 'dd-mm-yy' dateFormat : 'dd-mm-yy'
}); });
} }
} };
$(document).ready(function() { $(document).ready(function() {
@ -512,7 +514,7 @@ $(document).ready(function() {
$(document).on('change', '#dropdown .permissions', function() { $(document).on('change', '#dropdown .permissions', function() {
if ($(this).attr('name') == 'edit') { if ($(this).attr('name') == 'edit') {
var li = $(this).parent().parent() var li = $(this).parent().parent();
var checkboxes = $('.permissions', li); var checkboxes = $('.permissions', li);
var checked = $(this).is(':checked'); var checked = $(this).is(':checked');
// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck // Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck

Loading…
Cancel
Save