diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -1951,14 +1951,6 @@ table.code-browser i[class^='icon-'] { z-index: 2; } - -.mentions-container { - width: 90% !important; -} -.mentions-container .yui-ac-content { - width: 100% !important; -} - .ac { vertical-align: top; } diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -649,7 +649,6 @@ function _comment_div_append_form($comme $comment_div.append($form_div); var $form = $comment_div.find("form"); var $textarea = $form.find('textarea'); - var $mentions_container = $form.find('div.mentions-container'); $form.submit(function(e) { e.preventDefault(); @@ -713,7 +712,7 @@ function _comment_div_append_form($comme tooltip_activate(); if ($textarea.length > 0) { - MentionsAutoComplete($textarea, $mentions_container, _USERS_AC_DATA); + MentionsAutoComplete($textarea, _USERS_AC_DATA); } if (f_path) { $textarea.focus(); @@ -1113,7 +1112,8 @@ var autocompleteFormatter = function (oR }; // Generate a basic autocomplete instance that can be tweaked further by the caller -var autocompleteCreate = function ($inputElement, $container, matchFunc) { +var autocompleteCreate = function ($inputElement, matchFunc) { + var $container = $('
').insertAfter($inputElement); var datasource = new YAHOO.util.FunctionDataSource(matchFunc); var autocomplete = new YAHOO.widget.AutoComplete($inputElement[0], $container[0], datasource); @@ -1127,13 +1127,13 @@ var autocompleteCreate = function ($inpu return autocomplete; } -var SimpleUserAutoComplete = function ($inputElement, $container, users_list) { +var SimpleUserAutoComplete = function ($inputElement, users_list) { var matchUsers = function (sQuery) { return autocompleteMatchUsers(sQuery, users_list); } - var userAC = autocompleteCreate($inputElement, $container, matchUsers); + var userAC = autocompleteCreate($inputElement, matchUsers); // Handler for selection of an entry var itemSelectHandler = function (sType, aArgs) { @@ -1145,7 +1145,7 @@ var SimpleUserAutoComplete = function ($ userAC.itemSelectEvent.subscribe(itemSelectHandler); } -var MembersAutoComplete = function ($inputElement, $container, users_list, groups_list) { +var MembersAutoComplete = function ($inputElement, users_list, groups_list) { var matchAll = function (sQuery) { var u = autocompleteMatchUsers(sQuery, users_list); @@ -1153,7 +1153,7 @@ var MembersAutoComplete = function ($inp return u.concat(g); }; - var membersAC = autocompleteCreate($inputElement, $container, matchAll); + var membersAC = autocompleteCreate($inputElement, matchAll); // Handler for selection of an entry var itemSelectHandler = function (sType, aArgs) { @@ -1175,8 +1175,7 @@ var MembersAutoComplete = function ($inp membersAC.itemSelectEvent.subscribe(itemSelectHandler); } -var MentionsAutoComplete = function ($inputElement, $container, users_list) { - +var MentionsAutoComplete = function ($inputElement, users_list) { var matchUsers = function (sQuery) { var org_sQuery = sQuery; if(this.mentionQuery == null){ @@ -1186,7 +1185,7 @@ var MentionsAutoComplete = function ($in return autocompleteMatchUsers(sQuery, users_list); } - var mentionsAC = autocompleteCreate($inputElement, $container, matchUsers); + var mentionsAC = autocompleteCreate($inputElement, matchUsers); mentionsAC.suppressInputUpdate = true; // Overwrite formatResult to take into account mentionQuery mentionsAC.formatResult = function (oResultData, sQuery, sResultMatch) { @@ -1307,13 +1306,12 @@ var removeReviewMember = function(review } /* activate auto completion of users as PR reviewers */ -var PullRequestAutoComplete = function ($inputElement, $container, users_list) { - +var PullRequestAutoComplete = function ($inputElement, users_list) { var matchUsers = function (sQuery) { return autocompleteMatchUsers(sQuery, users_list); }; - var reviewerAC = autocompleteCreate($inputElement, $container, matchUsers); + var reviewerAC = autocompleteCreate($inputElement, matchUsers); reviewerAC.suppressInputUpdate = true; // Handler for selection of an entry @@ -1341,15 +1339,13 @@ function addPermAction(perm_type, users_ '
' + '' + '' + - '
' + '
' + '' + ''; var $last_node = $('.last_new_member').last(); // empty tr between last and add var next_id = $('.new_members').length; $last_node.before($('').append(template.format(next_id, perm_type))); - MembersAutoComplete($("#perm_new_member_name_"+next_id), - $("#perm_container_"+next_id), users_list, groups_list); + MembersAutoComplete($("#perm_new_member_name_"+next_id), users_list, groups_list); } function ajaxActionRevokePermission(url, obj_id, obj_type, field_id, extra_data) { diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html +++ b/kallithea/templates/admin/repos/repo_edit_settings.html @@ -44,7 +44,6 @@ ${h.form(url('update_repo', repo_name=c.
${h.text('owner',class_='yui-ac-input form-control')} ${_('Change owner of this repository.')} -
@@ -124,6 +123,6 @@ ${h.form(url('update_repo', repo_name=c. // autocomplete var _USERS_AC_DATA = ${h.js(c.users_array)}; - SimpleUserAutoComplete($('#owner'), $('#owner_container'), _USERS_AC_DATA); + SimpleUserAutoComplete($('#owner'), _USERS_AC_DATA); }); diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html +++ b/kallithea/templates/changeset/changeset_file_comment.html @@ -57,7 +57,6 @@
${_('Commenting on line.')} ${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}
-