Skip to content

Commit 5fb3cf2

Browse files
jnarebgitster
authored andcommitted
gitweb: Highlight matched part of project description when searching projects
Use esc_html_match_hl() from earlier commit to mark match in the _whole_ description when searching projects. Currently, with this commit, when searching projects there is always shown full description of a project, and not a shortened one (like for ordinary projects list view), even if the match is on project name and not project description. Because we always show full description of a project, and not possibly shortened name, there is no need for having full description on mouseover via title attribute. Showing full description when there is match on it is useful to avoid situation where match is in shortened, invisible part. On the other hand that makes project search different than projects list view; also there can be problems with overly-long project descriptions. Signed-off-by: Jakub Narebski <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 07a4006 commit 5fb3cf2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

gitweb/gitweb.perl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5404,8 +5404,12 @@ sub git_project_list_rows {
54045404
esc_html_match_hl($pr->{'path'}, $search_regexp)) .
54055405
"</td>\n" .
54065406
"<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
5407-
-class => "list", -title => $pr->{'descr_long'}},
5408-
esc_html($pr->{'descr'})) . "</td>\n" .
5407+
-class => "list",
5408+
$search_regexp ? () : -title => $pr->{'descr_long'}},
5409+
$search_regexp
5410+
? esc_html_match_hl($pr->{'descr_long'}, $search_regexp)
5411+
: esc_html($pr->{'descr'})) .
5412+
"</td>\n" .
54095413
"<td><i>" . chop_and_escape_str($pr->{'owner'}, 15) . "</i></td>\n";
54105414
print "<td class=\"". age_class($pr->{'age'}) . "\">" .
54115415
(defined $pr->{'age_string'} ? $pr->{'age_string'} : "No commits") . "</td>\n" .

0 commit comments

Comments
 (0)