User: sits
Date: 08/06/11 00:52:05
Modified: lib/Codestriker/Http DeltaRenderer.pm
template/en/default viewdeltas.html.tmpl viewtopic.html.tmpl
Log:
Generate the comment links correctly with the right filenumber.
Index: DeltaRenderer.pm
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/lib/Codestriker/Http/DeltaRenderer.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeltaRenderer.pm 14 Mar 2008 01:30:52 -0000 1.3
+++ DeltaRenderer.pm 11 Jun 2008 07:52:04 -0000 1.4
@@ -136,7 +136,6 @@
@{$self->{diff_old_lines_numbers}} = ();
@{$self->{diff_new_lines}} = ();
@{$self->{diff_new_lines_numbers}} = ();
- $self->{filenumber} = 0;
$self->{current_filename} = "";
for (my $i = 0; $i <= $#diff_lines; $i++) {
my $data = $diff_lines[$i];
@@ -159,7 +158,7 @@
$data =~ s/^\s//;
# Render what has been currently recorded.
- $self->_render_changes();
+ $self->_render_changes($delta->{filenumber});
# Now that the diff changeset has been rendered, remove the
state data.
@{$self->{diff_old_lines}} = ();
@@ -174,12 +173,12 @@
$self->{mode} == $Codestriker::COLOURED_MODE ? "n" : "msn";
$line->{old_data} = $data;
$line->{old_data_line} =
- $self->comment_link($self->{filenumber}, $old_linenumber,
+ $self->comment_link($delta->{filenumber}, $old_linenumber,
0, $old_linenumber);
$line->{old_data_class} = $data_class;
$line->{new_data} = $data;
$line->{new_data_line} =
- $self->comment_link($self->{filenumber}, $new_linenumber,
+ $self->comment_link($delta->{filenumber}, $new_linenumber,
1, $new_linenumber);
$line->{new_data_class} = $data_class;
push @{$self->{lines}}, $line;
@@ -200,14 +199,13 @@
}
# Render any remaining diff segments.
- $self->_render_changes();
+ $self->_render_changes($delta->{filenumber});
# Store the processed lines with the delta object for rendering.
@{$delta->{lines}} = @{$self->{lines}};
if ($self->{current_filename} ne $delta->{filename}) {
# Keep track of the current filename being processed.
- $self->{filenumber}++;
$self->{current_filename} = $delta->{filename};
}
}
@@ -216,7 +214,7 @@
# Annotate any accumlated diff changes.
sub _render_changes
{
- my ($self) = @_;
+ my ($self, $filenumber) = @_;
# Determine the class to use for displaying the comments.
my ($old_col, $old_notpresent_col, $new_col, $new_notpresent_col);
@@ -295,13 +293,13 @@
if (defined $old_data) {
$line->{old_data} = $self->_apply_line_filters($old_data);
$line->{old_data_line} =
- $self->comment_link($self->{filenumber}, $old_data_line, 0,
$old_data_line);
+ $self->comment_link($filenumber, $old_data_line, 0,
$old_data_line);
}
$line->{old_data_class} = $render_old_colour;
if (defined $new_data) {
$line->{new_data} = $self->_apply_line_filters($new_data);
$line->{new_data_line} =
- $self->comment_link($self->{filenumber}, $new_data_line, 1,
$new_data_line);
+ $self->comment_link($filenumber, $new_data_line, 1,
$new_data_line);
}
$line->{new_data_class} = $render_new_colour;
push @{$self->{lines}}, $line;
Index: viewdeltas.html.tmpl
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/template/en/default/viewdeltas.html.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- viewdeltas.html.tmpl 14 Mar 2008 01:30:53 -0000 1.5
+++ viewdeltas.html.tmpl 11 Jun 2008 07:52:04 -0000 1.6
@@ -1,7 +1,6 @@
[%# HTML for rendering a set of deltas. #%]
[% SET diff_current_filename = "" %]
-[% SET filenumber = 0 %]
[% FOREACH delta = deltas %]
[% FLUSH IF loop.count() % 10 == 1 %]
[%# Check if a heading for the current diff needs to be output. #%]
@@ -24,7 +23,6 @@
</tr>
[% END %]
</table>
- [% filenumber = filenumber + 1 %]
[%# Make sure all the diffs are aligned in the same table. #%]
<table width="100%" cellspacing="0" cellpadding="0" border="0">
Index: viewtopic.html.tmpl
===================================================================
RCS file:
/cvsroot/codestriker/codestriker/template/en/default/viewtopic.html.tmpl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- viewtopic.html.tmpl 13 Mar 2008 22:39:07 -0000 1.45
+++ viewtopic.html.tmpl 11 Jun 2008 07:52:04 -0000 1.46
@@ -1,11 +1,6 @@
</head>
<body onload="view_topic_on_load_handler();">
-[%# Screen for displaying the heading information of a topic. The
- actual view topic data is still generated directly from the perl
- script, as it is complex HTML that doesn't need to be
- customised. #%]
-
[% PROCESS viewtopicheader.html.tmpl version = version
help = "x504.html#VIEW-TOPIC" topicview = 1 topicproperties = 0
topiccomments = 0 topicinfo = 0 closehead = 0 %]
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Codestriker-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/codestriker-commits
