Skip to content

Commit abe2b5c

Browse files
authored
Merge branch 'master' into hubs_2
2 parents 78fbc73 + fe33399 commit abe2b5c

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

dev/ucsc/slowHub.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
includeTracks: true
2020
}
2121

22-
2322
const hub = await Hub.loadHub("https://hgdownload.soe.ucsc.edu/hubs/GCA/004/027/145/GCA_004027145.1/hub.txt", hubOptions)
2423

24+
2525
const igvConfig = {
2626
showChromosomeWidget: false,
2727
locus: hub.getDefaultPosition(),

js/browser.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,9 @@ class Browser {
493493
return new XMLSession(string, knownGenomes)
494494

495495
} else if (filename.endsWith("hub.txt")) {
496+
496497
const hub = await Hub.loadHub(urlOrFile, options)
498+
497499
if(chromosomeSelectWidget) {
498500
chromosomeSelectWidget.hide()
499501
}

js/ucsc/ucscHub.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class Hub {
2929
return new Hub(url, stanzas, groups)
3030
}
3131

32-
3332
constructor(url, stanzas, groupStanzas) {
3433

3534
const idx = url.lastIndexOf("/")
@@ -158,6 +157,7 @@ isPcr dynablat-01.soe.ucsc.edu 4040 dynamic GCF/000/186/305/GCF_000186305.1
158157
if (this.genomeStanza.hasProperty("twoBitBptURL")) {
159158
config.twoBitBptURL = this.baseURL + this.genomeStanza.getProperty("twoBitBptURL")
160159
}
160+
161161
if (this.genomeStanza.hasProperty("twoBitBptUrl")) {
162162
config.twoBitBptURL = this.baseURL + this.genomeStanza.getProperty("twoBitBptUrl")
163163
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"circular-view": "github:igvteam/circular-view#v0.2.4",
5454
"eslint": "^6.4.0",
5555
"hdf5-indexed-reader": "github:jrobinso/hdf5-indexed-reader#v0.5.2",
56-
"igv-ui": "github:igvteam/igv-ui#dat_slider_dialog",
56+
"igv-ui": "github:igvteam/igv-ui#v1.5.3",
5757
"igv-utils": "github:igvteam/igv-utils#v1.4.8",
5858
"mocha": "^10.2.0",
5959
"rollup": "^2.66.0",

test/testUCSC.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import BWReader from "../js/bigwig/bwReader.js"
66

77
suite("ucsc utilities", function () {
88

9-
109
test("trix", async function () {
1110

1211
this.timeout(200000)

0 commit comments

Comments
 (0)