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

Automated merge of next-stable to default

Browse Source
This commit is contained in:
Jeremy Goecks
2014-04-03 14:34:17 -04:00
parent 9f5f3a93e1 18c2e3fc71
commit e630fb10c8
2 changed files with 23 additions and 8 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
+22 -7
View File
@@ -692,14 +692,16 @@ extend(DrawableGroup.prototype, Drawable.prototype, DrawableCollection.prototype
this.action_icons.filters_icon.hide();
}
else { // There are 2 or more tracks.
//
// Determine if a composite track can be created. Current criteria:
// (a) all tracks are the same;
// (a) all tracks are line tracks;
// OR
// FIXME: this is not enabled right now because it has not been well tested:
// (b) there is a single FeatureTrack.
//
/// All tracks the same?
// All tracks the same?
var i, j, drawable,
same_type = true,
a_type = this.drawables[0].get_type(),
@@ -715,14 +717,14 @@ extend(DrawableGroup.prototype, Drawable.prototype, DrawableCollection.prototype
}
}
if (same_type || num_feature_tracks === 1) {
if (same_type && this.drawables[0] instanceof LineTrack) {
this.action_icons.composite_icon.show();
}
else {
this.action_icons.composite_icon.hide();
$(".tooltip").remove();
}
//
// Set up group-level filtering and update filter icon.
//
@@ -2365,7 +2367,7 @@ extend(Track.prototype, Drawable.prototype, {
track.tile_cache.clear();
in_drag = false;
if (!in_handle) { drag_control.hide(); }
track.config.set('height', track.visible_height_px);
track.config.set_value('height', track.visible_height_px);
track.changed();
}).appendTo(track.container_div);
},
@@ -3432,6 +3434,18 @@ extend(CompositeTrack.prototype, TiledTrack.prototype, {
this.request_draw({ clear_tile_cache: true });
},
/**
* Action to take during resize.
*/
on_resize: function() {
// Propogate visible height to other tracks.
var visible_height = this.visible_height_px;
_.each(this.drawables, function(d) {
d.visible_height_px = visible_height;
});
Track.prototype.on_resize.call(this);
},
/**
* Change mode for all tracks.
*/
@@ -3499,7 +3513,8 @@ extend(CompositeTrack.prototype, TiledTrack.prototype, {
* Actions taken before drawing.
*/
before_draw: function() {
TiledTrack.prototype.before_draw.call(this);
// FIXME: this is needed only if there are feature tracks in the composite track.
// TiledTrack.prototype.before_draw.call(this);
//
// Set min, max for tracks to be largest min, max.
@@ -3507,7 +3522,7 @@ extend(CompositeTrack.prototype, TiledTrack.prototype, {
// Get smallest min, biggest max.
var min = _.min(_.map(this.drawables, function(d) { return d.config.get_value('min_value'); })),
max = _.max(_.map(this.drawables, function(d) { return d.config.get_value('max_value') }));
max = _.max(_.map(this.drawables, function(d) { return d.config.get_value('max_value'); }));
this.config.set_value('min_value', min);
this.config.set_value('max_value', max);