Skip to content

Commit 9f67e1a

Browse files
colin-combecolin-combe
authored
Merge pull request #183 from colin-combe/master
tooltip fix; keep bars in same place when scale changes
2 parents 12646b0 + aad6b00 commit 9f67e1a

8 files changed

Lines changed: 149 additions & 164 deletions

File tree

‎data/index.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ const exampleIndex = [
3838
{
3939
"ac": "EBI-25816865",
4040
"name": "EBI-25816865",
41-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-25816865",
41+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-25816865",
4242
},
4343
{
4444
"ac": "EBI-25570228",
4545
"name": "EBI-25570228",
46-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-25570228",
46+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-25570228",
4747
},
4848
{
4949
"ac": "~EBI-6884640",
5050
"name": "~EBI-6884640",
51-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-6884640",
51+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-6884640",
5252
},
5353
{
5454
"ac": "CPX-1920",
@@ -58,7 +58,7 @@ const exampleIndex = [
5858
{
5959
"ac": "EBI-9008420",
6060
"name": "Hemoglobin HbA complex",
61-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9008420",
61+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9008420",
6262
},
6363
{
6464
"ac": "EBI-4371590",
@@ -121,37 +121,37 @@ const exampleIndex = [
121121
{
122122
"ac": "EBI-1202920",
123123
"name": "PCNA homotrimer",
124-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-1202920",
124+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-1202920",
125125
},
126126
{
127127
"ac": "EBI-6554207",
128128
"name": "DnaB helicase complex",
129-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-6554207",
129+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-6554207",
130130
},
131131
{
132132
"ac": "EBI-8869931",
133133
"name": "IscS-TusA complex",
134-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-8869931",
134+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-8869931",
135135
},
136136
{
137137
"ac": "EBI-9008283",
138138
"name": "Chaperonin-containing T-complex",
139-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9008283",
139+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9008283",
140140
},
141141
{
142142
"ac": "EBI-9696567",
143143
"name": "Core mediator complex",
144-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9696567",
144+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9696567",
145145
},
146146
{
147147
"ac": "EBI-9997373",
148148
"name": "Telomerase holoenzyme complex",
149-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9997373",
149+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9997373",
150150
},
151151
{
152152
"ac": "EBI-10828997",
153153
"name": "GLI3-SUFU complex",
154-
"url": "http://www.ebi.ac.uk/intact/complex/details/EBI-10828997",
154+
"url": "https://www.ebi.ac.uk/intact/complex/details/EBI-10828997",
155155
},
156156
{
157157
"ac": "CPX-1599",

‎dist/complexviewer.js‎

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@
123123
</div> <!-- centreDiv -->
124124

125125
<div class="logo-bar space-between">
126-
<a class="logo" href="http://rappsilberlab.org/" target="_blank"><img src="images/logos/rappsilber-logo.png"
126+
<a class="logo" href="https://rappsilberlab.org/" target="_blank"><img src="images/logos/rappsilber-logo.png"
127127
alt="Rappsilber Laboratory"></a>
128-
<a class="logo" href="http://www.ed.ac.uk/" target="_blank"><img src="./images/logos/eduni.jpeg"
128+
<a class="logo" href="https://www.ed.ac.uk/" target="_blank"><img src="./images/logos/eduni.jpeg"
129129
alt="Edinburgh University"></a>
130-
<a class="logo" href="http://www.wcb.ed.ac.uk/" target="_blank"><img src="images/logos/wtccb.png"
130+
<a class="logo" href="https://www.wcb.ed.ac.uk/" target="_blank"><img src="images/logos/wtccb.png"
131131
alt="Wellcome Trust Centre for Cell Biology"></a>
132-
<a class="logo" href="http://www.ebi.ac.uk/" target="_blank"><img src="images/logos/ebi-logo.jpeg"
132+
<a class="logo" href="https://www.ebi.ac.uk/" target="_blank"><img src="images/logos/ebi-logo.jpeg"
133133
alt="European Bioinformatics Institute"></a>
134-
<a class="logo" href="http://intermine.org/" target="_blank"><img src="./images/logos/intermine.png"
134+
<a class="logo" href="https://intermine.org/" target="_blank"><img src="./images/logos/intermine.png"
135135
alt="Intermine"></a>
136136
<a class="logo" href="https://www.cam.ac.uk/" target="_blank"><img src="./images/logos/cambridge-blue.png"
137137
alt="Cambridge University"></a>

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "complexviewer",
3-
"version": "2.1.12",
3+
"version": "2.1.13",
44
"description": "A network visualisation that displays molecular interaction data, including detailed residue-level information such as binding sites. Used in EBI's Complex Portal and elsewhere.",
55
"author": {
66
"name": "Colin Combe",
@@ -56,6 +56,7 @@
5656
"dependencies": {
5757
"colorbrewer": "^1.3.0",
5858
"core-js": "^3.15.2",
59+
"jquery": "^3.6.0",
5960
"d3": "~3.5.5",
6061
"d3-scale-chromatic": "^1.5.0",
6162
"intersectionjs": "^1.0.1",

0 commit comments

Comments
 (0)