Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/igvteam/igv.js into issue…
Browse files Browse the repository at this point in the history
…-1928-cytoband-name
  • Loading branch information
yarong-lifemap committed Jan 17, 2025
2 parents 96607da + 696a29f commit 674c6aa
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion js/bigwig/bwReader.js
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ class BWReader {
if (this.type === "bigwig") {
return "wig"
} else {
return this.autoSql && this.autoSql.table === "chromatinInteract" ? "interact" : "annotation"
return this.autoSql && ("interact" === this.autoSql.table || "chromatinInteract" === this.autoSql.table) ? "interact" : "annotation"
}
}

Expand Down
2 changes: 1 addition & 1 deletion js/feature/interactionTrack.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class InteractionTrack extends TrackBase {
}

get supportsWholeGenome() {
return true
return typeof this.featureSource.supportsWholeGenome === 'function' ? this.featureSource.supportsWholeGenome() : true;
}

async getFeatures(chr, start, end) {
Expand Down
4 changes: 2 additions & 2 deletions js/trackViewport.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ class TrackViewport extends Viewport {
checkZoomIn() {

const zoomedOutOfWindow = () => {
if (this.referenceFrame.chr.toLowerCase() === "all" && !this.trackView.track.supportsWholeGenome) {
return true
if (this.referenceFrame.chr.toLowerCase() === "all") {
return !this.trackView.track.supportsWholeGenome
} else {
const visibilityWindow = this.trackView.track.visibilityWindow
return (
Expand Down
2 changes: 1 addition & 1 deletion js/version.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const _version = "3.1.2"
const _version = "3.1.3"
function version() {
return _version
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igv",
"version": "3.1.2",
"version": "3.1.3",
"main": "dist/igv.esm.js",
"browser": "dist/igv.js",
"module": "dist/igv.esm.js",
Expand Down

0 comments on commit 674c6aa

Please sign in to comment.