Merge pull request #667 from dondi/beta

hotfixes
dondi · Jun 2, 2018 · 7db3c28 · 7db3c28
2 parents 5deb79f + 1ad81e7
commit 7db3c28
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grnsight",
-  "version": "3.1.0",
+  "version": "3.1.3",
   "description": "Web app and service for visualizing models of gene regulatory networks",
   "directories": {
     "test": "test"

diff --git a/web-client/public/gene/api.js b/web-client/public/gene/api.js
@@ -257,7 +257,14 @@ var parseGeneOntology = function (data) {
     };
 
     for (var k = 0; k < data.length; k++) {
-        if ((k > 0) && (data[k].go.go_id !== data[k - 1].go.go_id)) {
+        var isUnique = true;
+        for (var len = 0; len < k; len++) {
+            if (data[k].go.go_id === data[len].go.go_id) {
+                isUnique = false;
+            }
+        }
+
+        if (isUnique) {
             switch (data[k].go.go_aspect ) {
             case "molecular function":
                 goTemplate.molecularFunction[goTemplate.molecularFunction.length] = {
@@ -282,6 +289,7 @@ var parseGeneOntology = function (data) {
                 break;
             }
         }
+
     }
 
     for (var prop in goTemplate) {

diff --git a/web-client/public/gene/info.css b/web-client/public/gene/info.css
@@ -128,6 +128,7 @@ sup {
 
 #mainPage {
   z-index: 0;
+  min-height: 500px;
 }
 
 #pageHead {

diff --git a/web-client/public/gene/info.js b/web-client/public/gene/info.js
@@ -148,8 +148,8 @@
         $(".molecularFunction").append("<dl class=\"row molecularFunctionTable\"></dl>");
         for (let k = 0; k < molecularFunction.length; k++) {
             link = "https://www.yeastgenome.org" + molecularFunction[k].link;
-            $(".molecularFunctionTable").append("<a href=\"" + link
-            + "\" class=\"col-xl-3\"><dd>" + molecularFunction[k].id + "</dd></a>");
+            $(".molecularFunctionTable").append("<dd><a href=\"" + link
+            + "\" class=\"col-xl-3\">" + molecularFunction[k].id + "</a></dd>");
             $(".molecularFunctionTable").append("<dd class=\"sgdSource col-xl-9\">"
             + molecularFunction[k].displayName + "</dd>");
         }
@@ -158,8 +158,8 @@
         $(".biologicalProcess").append("<dl class=\"row biologicalProcessTable\"></dl>");
         for (let k = 0; k < biologicalProcess.length; k++) {
             link = "https://www.yeastgenome.org" +  biologicalProcess[k].link;
-            $(".biologicalProcessTable").append("<a href=\"" + link
-            + "\"  class=\"col-xl-3\"><dd>" + biologicalProcess[k].id + "</dd></a>");
+            $(".biologicalProcessTable").append("<dd><a href=\"" + link
+            + "\"  class=\"col-xl-3\">" + biologicalProcess[k].id + "</a></dd>");
             $(".biologicalProcessTable").append("<dd class=\"sgdSource col-xl-9\">"
             + biologicalProcess[k].displayName + "</dd>");
         }
@@ -168,8 +168,8 @@
         $(".cellularComponent").append("<dl class=\" row cellularComponentTable\"></dl>");
         for (let k = 0; k < cellularComponent.length; k++) {
             link = "https://www.yeastgenome.org" +  cellularComponent[k].link;
-            $(".cellularComponentTable").append("<a href=\"" + link
-            + "\" class=\"col-xl-3\"><dd>" + cellularComponent[k].id + "</dd></a>");
+            $(".cellularComponentTable").append("<dd><a href=\"" + link
+            + "\" class=\"col-xl-3\">" + cellularComponent[k].id + "</a></dd>");
             $(".cellularComponentTable").append("<dd class=\"sgdSource col-xl-9\">"
             + cellularComponent[k].displayName + "</dd>");
         }

diff --git a/web-client/views/info.jade b/web-client/views/info.jade
@@ -116,20 +116,20 @@ html
                         //dt.col-sm-3  Targets:
                         //dd.targets.col-sm-9
                         dt.col-sm-3  Sequence Logo:
-                        dd.col-sm-9
+                        dd.col-sm-9.jasparSource
                           img.sequenceLogo(src='')
                         dt.col-sm-3  Frequency Matrix:
-                        dd.col-sm-9
+                        dd.col-sm-9.jasparSource
                           table.frequencyMatrix.table.table-dark.table-striped
                             thead
-                              tr.frequencyOfA
+                              tr.frequencyOfA.jasparSource
                                 th A:
                             tbody
-                              tr.frequencyOfC
+                              tr.frequencyOfC.jasparSource
                                 th C:
-                              tr.frequencyOfG
+                              tr.frequencyOfG.jasparSource
                                 th G:
-                              tr.frequencyOfT
+                              tr.frequencyOfT.jasparSource
                                 th T:
                 //
                   <div class="card">