opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in jgoecks/galaxy-central-gcc-2014-fixes/stable (pull request #425)

Browse Source 
Trackster fixes
This commit is contained in:
Dannon Baker
2014-06-26 09:02:02 -04:00
parent c6a39826d5 a35fc2a598
commit 0923ea9e8e
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/scripts/packed/viz/trackster/tracks.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/viz/trackster/tracks.js
+20 -9
View File
@@ -1070,11 +1070,10 @@ var TracksterView = Backbone.View.extend({
var delta_chrom = Math.round(delta / view.viewport_container.width() * (view.high - view.low));
view.move_delta(delta_chrom);
// Also capture mouse wheel for left/right scrolling
}).bind( 'mousewheel', function( e, d, dx, dy ) {
// Only act on x axis scrolling if we see if, y will be i
// handled by the browser when the event bubbles up
if ( dx ) {
dx *= 50;
}).bind( 'mousewheel', function( e, d, dx, dy ) {
// Only handle x axis scrolling; y axis scrolling is
// handled by the browser when the event bubbles up.
if (dx) {
var delta_chrom = Math.round( - dx / view.viewport_container.width() * (view.high - view.low) );
view.move_delta( delta_chrom );
}
@@ -1579,8 +1578,14 @@ extend( TracksterView.prototype, DrawableCollection.prototype, {
this.request_redraw();
},
resize_window: function() {
/** Resize viewport. Use this method if header/footer content has changed in size. */
resize_viewport: function() {
this.viewport_container.height( this.container.height() - this.top_container.height() - this.bottom_container.height() );
},
/** Called when window is resized. */
resize_window: function() {
this.resize_viewport();
this.request_redraw();
},
@@ -2940,6 +2945,12 @@ extend(TiledTrack.prototype, Drawable.prototype, Track.prototype, {
* drawn/fetched and shown.
*/
postdraw_actions: function(tiles, width, w_scale, clear_after) {
// If reference track is visible, adjust viewport to be smaller so that bottom content
// is visible.
if (this.view.reference_track.tiles_div.is(':visible')) {
this.view.resize_viewport();
}
var line_track_tiles = _.filter(tiles, function(tile) {
return (tile instanceof LineTrackTile);
});
@@ -3618,15 +3629,15 @@ extend(ReferenceTrack.prototype, Drawable.prototype, TiledTrack.prototype, {
can_draw: Drawable.prototype.can_draw,
/**
* Retrieves data and draws tile if reference data can be displayed.
* Draws and shows tile if reference data can be displayed; otherwise track is hidden.
*/
draw_helper: function(region, w_scale, options) {
if (w_scale > this.view.canvas_manager.char_width_px) {
this.tiles_div.show();
this.tiles_div.show();
return TiledTrack.prototype.draw_helper.call(this, region, w_scale, options);
}
else {
this.tiles_div.hide();
this.tiles_div.hide();
return null;
}
},