undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Pass esc_html_hl_regions() options to esc_html()

Browse Source 
With this change, esc_html_hl_regions() accepts options and passes them
down to esc_html().  This may be needed if a caller wants to pass
-nbsp=>1 to esc_html().

The idea and implementation example of this change was described in
337da8d2 (gitweb: Introduce esc_html_match_hl and esc_html_hl_regions,
2012-02-27).  While other suggestions may be more useful in some cases,
there is no need to implement them at the moment.  The
esc_html_hl_regions() interface may be changed later if it's needed.

[mk: extracted from larger patch and wrote commit message]

Signed-off-by: Jakub Narębski <jnareb@gmail.com>
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jakub Narębski 2012-04-11 23:18:39 +02:00 committed by Junio C Hamano
parent cbbea3dfc1
commit 9768a9d884
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gitweb/gitweb.perl
View File

@ -1732,7 +1732,9 @@ sub chop_and_escape_str {
# '<span class="mark">foo</span>bar' # '<span class="mark">foo</span>bar'
sub esc_html_hl_regions { sub esc_html_hl_regions {
my ($str, $css_class, @sel) = @_; my ($str, $css_class, @sel) = @_;
return esc_html($str) unless @sel; my %opts = grep { ref($_) ne 'ARRAY' } @sel;
@sel = grep { ref($_) eq 'ARRAY' } @sel;
return esc_html($str, %opts) unless @sel;
my $out = ''; my $out = '';
my $pos = 0; my $pos = 0;
@ -1743,15 +1745,16 @@ sub esc_html_hl_regions {
# Don't create empty <span> elements. # Don't create empty <span> elements.
next if $end <= $begin; next if $end <= $begin;
my $escaped = esc_html(substr($str, $begin, $end - $begin)); my $escaped = esc_html(substr($str, $begin, $end - $begin),
%opts);
$out .= esc_html(substr($str, $pos, $begin - $pos)) $out .= esc_html(substr($str, $pos, $begin - $pos), %opts)
if ($begin - $pos > 0); if ($begin - $pos > 0);
$out .= $cgi->span({-class => $css_class}, $escaped); $out .= $cgi->span({-class => $css_class}, $escaped);
$pos = $end; $pos = $end;
} }
$out .= esc_html(substr($str, $pos)) $out .= esc_html(substr($str, $pos), %opts)
if ($pos < length($str)); if ($pos < length($str));
return $out; return $out;