From: "Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>
To: git@vger.kernel.org
Cc: "Jakub Narebski" <jnareb@gmail.com>,
"Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>
Subject: [PATCH v3 2/8] gitweb: esc_html_hl_regions(): Don't create empty <span> elements
Date: Wed, 4 Apr 2012 21:57:07 +0200 [thread overview]
Message-ID: <1333569433-3245-3-git-send-email-michal.kiedrowicz@gmail.com> (raw)
In-Reply-To: <1333569433-3245-1-git-send-email-michal.kiedrowicz@gmail.com>
If $end is equal to or less than $beg, esc_html_hl_regions()
generates an empty <span> element. It normally shouldn't be visible in
the web browser, but it doesn't look good when looking at page source.
It also minimally increases generated page size for no special reason.
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Acked-by: Jakub Narębski <jnareb@gmail.com>
---
gitweb/gitweb.perl | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index a3754ff..ca3058c 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1740,6 +1740,9 @@ sub esc_html_hl_regions {
for my $s (@sel) {
my ($beg, $end) = @$s;
+ # Don't create empty <span> elements.
+ next if $end <= $beg;
+
$out .= esc_html(substr($str, $pos, $beg - $pos))
if ($beg - $pos > 0);
$out .= $cgi->span({-class => $css_class},
--
1.7.8.4
next prev parent reply other threads:[~2012-04-04 19:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-04 19:57 [PATCH v3 0/8] Highlight interesting parts of diff Michał Kiedrowicz
2012-04-04 19:57 ` [PATCH v3 1/8] gitweb: Use descriptive names in esc_html_hl_regions() Michał Kiedrowicz
2012-04-04 21:38 ` Junio C Hamano
2012-04-05 5:46 ` Michal Kiedrowicz
2012-04-04 19:57 ` Michał Kiedrowicz [this message]
2012-04-04 19:57 ` [PATCH v3 3/8] gitweb: Pass esc_html_hl_regions() options to esc_html() Michał Kiedrowicz
2012-04-04 19:57 ` [PATCH v3 4/8] gitweb: Extract print_sidebyside_diff_lines() Michał Kiedrowicz
2012-04-04 21:47 ` Junio C Hamano
2012-04-04 22:47 ` Jakub Narebski
2012-04-05 6:06 ` Michal Kiedrowicz
2012-04-05 22:57 ` Jakub Narebski
2012-04-06 8:36 ` Michal Kiedrowicz
2012-04-04 19:57 ` [PATCH v3 5/8] gitweb: Use print_diff_chunk() for both side-by-side and inline diffs Michał Kiedrowicz
2012-04-05 23:26 ` Jakub Narebski
2012-04-06 8:34 ` Michal Kiedrowicz
2012-04-04 19:57 ` [PATCH v3 6/8] gitweb: Push formatting diff lines to print_diff_chunk() Michał Kiedrowicz
2012-04-04 19:57 ` [PATCH v3 7/8] gitweb: Highlight interesting parts of diff Michał Kiedrowicz
2012-04-05 6:25 ` Michal Kiedrowicz
2012-04-04 19:57 ` [PATCH v3 8/8] gitweb: Refinement highlightning in combined diffs Michał Kiedrowicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1333569433-3245-3-git-send-email-michal.kiedrowicz@gmail.com \
--to=michal.kiedrowicz@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).