Merge pull request #183 from colin-combe/master

tooltip fix; keep bars in same place when scale changes
MICommunity · Aug 19, 2021 · 9f67e1a · 9f67e1a
2 parents 12646b0 + aad6b00
commit 9f67e1a
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 164 deletions.
diff --git a/data/index.js b/data/index.js
@@ -38,17 +38,17 @@ const exampleIndex = [
     {
         "ac": "EBI-25816865",
         "name": "EBI-25816865",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-25816865",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-25816865",
     },
     {
         "ac": "EBI-25570228",
         "name": "EBI-25570228",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-25570228",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-25570228",
     },
     {
         "ac": "~EBI-6884640",
         "name": "~EBI-6884640",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-6884640",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-6884640",
     },
     {
         "ac": "CPX-1920",
@@ -58,7 +58,7 @@ const exampleIndex = [
     {
         "ac": "EBI-9008420",
         "name": "Hemoglobin HbA complex",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9008420",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9008420",
     },
     {
         "ac": "EBI-4371590",
@@ -121,37 +121,37 @@ const exampleIndex = [
     {
         "ac": "EBI-1202920",
         "name": "PCNA homotrimer",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-1202920",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-1202920",
     },
     {
         "ac": "EBI-6554207",
         "name": "DnaB helicase complex",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-6554207",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-6554207",
     },
     {
         "ac": "EBI-8869931",
         "name": "IscS-TusA complex",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-8869931",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-8869931",
     },
     {
         "ac": "EBI-9008283",
         "name": "Chaperonin-containing T-complex",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9008283",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9008283",
     },
     {
         "ac": "EBI-9696567",
         "name": "Core mediator complex",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9696567",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9696567",
     },
     {
         "ac": "EBI-9997373",
         "name": "Telomerase holoenzyme complex",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-9997373",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-9997373",
     },
     {
         "ac": "EBI-10828997",
         "name": "GLI3-SUFU complex",
-        "url": "http://www.ebi.ac.uk/intact/complex/details/EBI-10828997",
+        "url": "https://www.ebi.ac.uk/intact/complex/details/EBI-10828997",
     },
     {
         "ac": "CPX-1599",

diff --git a/dist/complexviewer.js b/dist/complexviewer.js
diff --git a/index.html b/index.html
@@ -123,15 +123,15 @@
     </div> <!-- centreDiv -->
 
     <div class="logo-bar space-between">
-        <a class="logo" href="http://rappsilberlab.org/" target="_blank"><img src="images/logos/rappsilber-logo.png"
+        <a class="logo" href="https://rappsilberlab.org/" target="_blank"><img src="images/logos/rappsilber-logo.png"
                                                                               alt="Rappsilber Laboratory"></a>
-        <a class="logo" href="http://www.ed.ac.uk/" target="_blank"><img src="./images/logos/eduni.jpeg"
+        <a class="logo" href="https://www.ed.ac.uk/" target="_blank"><img src="./images/logos/eduni.jpeg"
                                                                          alt="Edinburgh University"></a>
-        <a class="logo" href="http://www.wcb.ed.ac.uk/" target="_blank"><img src="images/logos/wtccb.png"
+        <a class="logo" href="https://www.wcb.ed.ac.uk/" target="_blank"><img src="images/logos/wtccb.png"
                                                                              alt="Wellcome Trust Centre for Cell Biology"></a>
-        <a class="logo" href="http://www.ebi.ac.uk/" target="_blank"><img src="images/logos/ebi-logo.jpeg"
+        <a class="logo" href="https://www.ebi.ac.uk/" target="_blank"><img src="images/logos/ebi-logo.jpeg"
                                                                           alt="European Bioinformatics Institute"></a>
-        <a class="logo" href="http://intermine.org/" target="_blank"><img src="./images/logos/intermine.png"
+        <a class="logo" href="https://intermine.org/" target="_blank"><img src="./images/logos/intermine.png"
                                                                           alt="Intermine"></a>
         <a class="logo" href="https://www.cam.ac.uk/" target="_blank"><img src="./images/logos/cambridge-blue.png"
                                                                            alt="Cambridge University"></a>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "complexviewer",
-  "version": "2.1.12",
+  "version": "2.1.13",
   "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.",
   "author": {
     "name": "Colin Combe",
@@ -56,6 +56,7 @@
   "dependencies": {
     "colorbrewer": "^1.3.0",
     "core-js": "^3.15.2",
+    "jquery": "^3.6.0",
     "d3": "~3.5.5",
     "d3-scale-chromatic": "^1.5.0",
     "intersectionjs": "^1.0.1",