Fixed some of the javascript after pulling Lei's changes to the search table

1 files changed, 16 insertions, 21 deletions

diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index da61f8a9..ca80af40 100755
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -49,9 +49,7 @@
                 <thead>
                     <tr>
                     {% for header in header_fields %}
-                        {% if header == 'Index' %}
-                        <th class="no-sort">{{header}}</th>
-                        {% elif header == 'Max LRS' %}
+                        {% if header == 'Max LRS' %}
                         <th style="text-align: right;">Max&nbsp;&nbsp;<br>LRS<a href="http://genenetwork.org//glossary.html#L" target="_blank"><sup style="color:#f00"> ?</sup></a></th>
                         {% elif header == 'Additive Effect' %}
                         <th style="text-align: right;">Additive<br>Effect<a href="http://genenetwork.org//glossary.html#A" target="_blank"><sup style="color:#f00"> ?</sup></a></th>
@@ -195,7 +193,11 @@
                 "autoWidth": true,
                 "bLengthChange": true,
                 "bDeferRender": true,
-                "bSortClasses": false
+                "bSortClasses": false,
+                "scrollY": "300px",
+                "scrollX": "100%",
+                "scrollCollapse": true,
+                "paging": false
             } );
             {% elif dataset.type == 'Publish' %}
             $('#trait_table').dataTable( {
@@ -215,27 +217,20 @@
                 "autoWidth": true,
                 "bLengthChange": true,
                 "bDeferRender": true,
-                "bSortClasses": false
+                "bSortClasses": false,
+                "scrollY": "300px",
+                "scrollX": "100%",
+                "scrollCollapse": true,
+                "paging": false
             } );
             {% endif %}
             console.timeEnd("Creating table");
+
+            var table = $('#trait_table').DataTable();
+            new $.fn.dataTable.FixedHeader( table );
+            new $.fn.dataTable.FixedColumns( table );
+         
         });
-		
-		$(document).ready( function () {
-			var table = $('#trait_table').DataTable();
-			new $.fn.dataTable.FixedHeader( table );
-		});
-
-		$(document).ready( function () {
-			var table = $('#trait_table').DataTable( {
-				"scrollY": "300px",
-				"scrollX": "100%",
-				"scrollCollapse": true,
-				"paging": false
-			});
-			new $.fn.dataTable.FixedColumns( table );
-		});
-        
     </script>
     
 {% endblock %}