Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/hkmoon/jbrowse into paired_r…
Browse files Browse the repository at this point in the history
…ead_tracks
  • Loading branch information
cmdcolin committed Oct 30, 2018
2 parents 23a8514 + a7dec7d commit 626710c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/JBrowse/Browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -1021,8 +1021,7 @@ initView: function() {
elem: this.viewElem,
config: this.config.view,
stripeWidth: 250,
refSeq: this.refSeq,
zoomLevel: 1/200
refSeq: this.refSeq
});

dojo.connect( this.view, "onFineMove", this, "onFineMove" );
Expand Down
3 changes: 3 additions & 0 deletions src/JBrowse/GenomeView.js
Original file line number Diff line number Diff line change
Expand Up @@ -2050,6 +2050,9 @@ showVisibleBlocks: function(updateHeight, pos, startX, endX, finishCallback) {
Math.round(this.pxToBp(this.offset
+ (this.stripeCount * this.stripeWidth)));

// Track update will be carried after the maxVisible has a value
if (!this.maxVisible()) return;

let showingPromises = []
this.overviewTrackIterate(function(track, view) {
showingPromises.push( new Promise((resolve,reject) => {
Expand Down

0 comments on commit 626710c

Please sign in to comment.