2 files changed, 10 insertions, 14 deletions
diff --git a/data/script.js b/data/script.js
index 81698ef7..fe42292f 100644
--- a/data/script.js
+++ b/data/script.js
@@ -3218,14 +3218,16 @@ if(byId('charops')) { (function() {
   var t = byClass('table', 'stripe');
   var spoil;
   var sexual;
-  var fixcomma = function(c) {
-    var l = byName(c, 'span');
+  // Fixes the commas between trait names and the hidden status of the entire row
+  var fixrow = function(c) {
+    var l = byName(byName(c, 'td')[1], 'span');
     var first = 1;
     for(var i=0; i<l.length; i+=2)
       if(!hasClass(l[i], 'hidden')) {
         setClass(l[i+1], 'hidden', first);
         first = 0;
       }
+    setClass(c, 'hidden', first);
   };
   var restripe = function() {
     for(var i=0; i<t.length; i++) {
@@ -3235,12 +3237,12 @@ if(byId('charops')) { (function() {
       setClass(t[i], 'stripe', false);
       var r = 1;
       var rows = byName(b[0], 'tr');
-      for(var j=0; j<rows.length; j++)
-        if(!hasClass(rows[j], 'nostripe') && !hasClass(rows[j], 'hidden')) {
-          if(hasClass(rows[j], 'charspoil'))
-            fixcomma(byName(rows[j], 'td')[1]);
+      for(var j=0; j<rows.length; j++) {
+        if(hasClass(rows[j], 'traitrow'))
+          fixrow(rows[j]);
+        if(!hasClass(rows[j], 'nostripe') && !hasClass(rows[j], 'hidden'))
           setClass(rows[j], 'odd', r++&1);
-        }
+      }
     }
   };
   var setall = function() {
diff --git a/lib/VNDB/Handler/Chars.pm b/lib/VNDB/Handler/Chars.pm
index 1f547c6e..fbafc2fe 100644
--- a/lib/VNDB/Handler/Chars.pm
+++ b/lib/VNDB/Handler/Chars.pm
@@ -167,13 +167,7 @@ sub charTable {
       push @{$groups{ $g }}, $_
     }
     for my $g (@groups) {
-      my $minspoil = 5;
-      my $fullsex = 1;
-      for(@{$groups{$g}}) {
-        $minspoil = $minspoil > $_->{spoil} ? $_->{spoil} : $minspoil;
-        $fullsex = 0 if !$_->{sexual};
-      }
-      Tr class => charspoil($minspoil).($fullsex ? ' sexual hidden' : '');
+      Tr class => 'traitrow';
        td class => 'key'; a href => '/i'.($groups{$g}[0]{group}||$groups{$g}[0]{tid}), $groups{$g}[0]{groupname} || $groups{$g}[0]{name}; end;
        td;
         for (0..$#{$groups{$g}}) {