Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix merge errors

  • Loading branch information...
commit c8bb32aa2f17187717461b10ff1bb7fc943b40f3 2 parents 32dba28 + 36e0bf8
Lincoln Stein authored
Showing with 5 additions and 5 deletions.
  1. +3 −0  Changes
  2. +2 −5 lib/Bio/Graphics/Browser2/RenderPanels.pm
View
3  Changes
@@ -6,7 +6,10 @@
mouse hovers or clicks on the feature. This noticeably speeds up track generation time. Drawback
is that this increases the delay before balloon pops up on the hover operation when run in
cgi-bin mode (still fast in FastCGI mode). Restore original behavior by setting "inline imagemaps"
+<<<<<<< HEAD
(or "inline imagemap").
+=======
+>>>>>>> 36e0bf8d73127c5ab03f40a4e0e3d7b013ee5ad4
to true in [TRACK DEFAULTS] or individual track definitions.
* Can now close tracks from main view even when corresponding track checkbox not showing
in the track listing.
View
7 lib/Bio/Graphics/Browser2/RenderPanels.pm
@@ -1179,13 +1179,11 @@ sub make_map {
my $source = $self->source;
- my $flip = $panel->flip;
- my $length = $self->segment->length;
+ my $length = $self->segment->length;
my $settings = $self->settings;
+ my $flip = $panel->flip;
my ($track_dbid) = $source->db_settings($label,$length);
- my $did_map;
-
local $^W = 0; # avoid uninit variable warnings due to poor coderefs
push @map, $self->make_centering_map(shift @$boxes,$flip,0,$first_box_is_scale)
@@ -1255,7 +1253,6 @@ sub make_imagemap_element_inline {
inline => 1
}
}
-
my $source = $self->source;
my $href = $self->make_link($feature,$panel,$label,$track);
my $title = unescape($self->make_title($feature,$panel,$label,$track));
Please sign in to comment.
Something went wrong with that request. Please try again.