bugfix to subfeature styles: subfeature CSS classes were not being ap…

…plied
GMOD · Mar 8, 2012 · fb4a18d · fb4a18d
1 parent 9c277b5
commit fb4a18d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 32 deletions.
diff --git a/genome.css b/genome.css
@@ -527,27 +527,11 @@ div.cds-hist {
     cursor: pointer;
 }
 
-.plus-triangle {
-    position:absolute;
-    height: 0px;
-    border-style: solid;
-    border-width: 6px 3px 0px 3px;
-    cursor: pointer;
-}
-
-.minus-triangle {
-    position:absolute;
-    height: 0px;
-    border-style: solid;
-    border-width: 0px 3px 6px 3px;
-    cursor: pointer;
-}
-
 .triangle {
     position:absolute;
     height: 0px;
     border-style: solid;
-    border-width: 6px 0px 0px 0px;
+    border-width: 6px 3px 0px 3px;
     cursor: pointer;
 }
 

diff --git a/js/FeatureTrack.js b/js/FeatureTrack.js
@@ -557,7 +557,7 @@ FeatureTrack.prototype.renderFeature = function(feature, uniqueId, block, scale,
     }
 
     var subfeatures = this.attrs.get(feature, "Subfeatures");
-    if (subfeatures) {
+    if( subfeatures ) {
         for (var i = 0; i < subfeatures.length; i++) {
             this.renderSubfeature(feature, featDiv,
                                   subfeatures[i],
@@ -601,23 +601,22 @@ FeatureTrack.prototype.renderSubfeature = function(feature, featDiv, subfeature,
 
     var subDiv = document.createElement("div");
 
-    if (this.subfeatureClasses) {
+    if( this.config.style.subfeatureClasses ) {
         var type = this.attrs.get(subfeature, "Type");
-        var className = this.config.style.subfeatureClasses[type];
+        subDiv.className = this.config.style.subfeatureClasses[type];
         switch (this.attrs.get(subfeature, "Strand")) {
-        case 1:
-        case '+':
-            subDiv.className = "plus-" + className; break;
-        case 0:
-        case '.':
-        case null:
-        case undefined:
-            subDiv.className = className; break;
-        case -1:
-        case '-':
-            subDiv.className = "minus-" + className; break;
+            case 1:
+            case '+':
+                subDiv.className += " plus-" + subDiv.className; break;
+            case 0:
+            case '.':
+            case null:
+            case undefined:
+                subDiv.className = className; break;
+            case -1:
+            case '-':
+                subDiv.className += " minus-" + subDiv.className; break;
         }
-
     }
 
     // if the feature has been truncated to where it doesn't cover