[FIX] fix controlbar on scroll

proteinevolution · May 29, 2017 · 62a6575 · 62a6575
1 parent 9c17139
commit 62a6575
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 33 deletions.
diff --git a/app/assets/ts/resulthelper.ts b/app/assets/ts/resulthelper.ts
@@ -5,21 +5,15 @@ declare var showMore : any;
 declare var numHits : any;
 declare var getHits: any;
 declare var colorAAs: boolean;
-
 let count = 0;
 
 // add scrollcontainer highlighting
 let followScroll = function(element : any) {
 
-
-
-    $(document).ready(function () {
+    $(element).ready(function () {
         $("#alignments").floatingScroll('init');
         //smoothscroll
         $('#scrollLinks a').on('click', function (e) {
-            e.preventDefault();
-            $(element).off("scroll");
-
             $('a').each(function () {
                 $(this).removeClass('colorToggleBar');
             });
@@ -28,22 +22,15 @@ let followScroll = function(element : any) {
     });
 
     $(element).on("scroll", function(){
-    try {
-        let top = $(element).scrollTop();
-        if (typeof top !== 'undefined') {
-            if (top >= $('#visualization').position().top + 75) {
-                // detached = $('#collapseMe').detach();
-                // $('.scrollContainer').append(detached);
-                $('.scrollContainer').addClass('fixed');
-                $('.scrollContainer').removeClass('scrollContainerWhite');
-                $('.scrollContainerDiv').removeClass('scrollContainerDivWhite');
-            } else {
-                // detached = $('#collapseMe').detach();
-                // $('.ui-widget-header').append(detached);
-                $('.scrollContainer').removeClass('fixed');
-                $('.scrollContainer').addClass('scrollContainerWhite');
-                $('.scrollContainerDiv').addClass('scrollContainerDivWhite');
-            }
+        let top = $(document).scrollTop();
+        if (top >= $('#visualization').position().top + 75) {
+            $('.scrollContainer').addClass('fixed');
+            $('.scrollContainer').removeClass('scrollContainerWhite');
+            $('.scrollContainerDiv').removeClass('scrollContainerDivWhite');
+        } else {
+            $('.scrollContainer').removeClass('fixed');
+            $('.scrollContainer').addClass('scrollContainerWhite');
+            $('.scrollContainerDiv').addClass('scrollContainerDivWhite');
         }
         // trigger lazyload for loading alignment
         if (top == $(this).height() - $(window).height()) {
@@ -57,7 +44,6 @@ let followScroll = function(element : any) {
                 shownHits = end;
             }
         }
-
         $('#scrollLinks a').each(function () {
             let currLink = $(this);
             let  refElement = $(currLink.attr("name"));
@@ -70,9 +56,6 @@ let followScroll = function(element : any) {
             }
         });
 
-    } catch (e) {
-        console.warn(e);
-    }
 
     });
 

diff --git a/public/javascripts/blast-visualization.js b/public/javascripts/blast-visualization.js
@@ -273,14 +273,14 @@ function scrollToElem(num){
     }
 }
 
-function scrollToSection(name){
+function scrollToSection(name) {
     var elem = $('#tool-tabs').hasClass("fullscreen") ? '#tool-tabs' : 'html, body';
-    var pos = $('#tool-tabs').hasClass("fullscreen") ? $('#'+name).offset().top + $(elem).scrollTop(): $('#'+name).offset().top;
+    var pos = $('#tool-tabs').hasClass("fullscreen") ? $('#' + name).offset().top + $(elem).scrollTop() : $('#' + name).offset().top;
     $(elem).animate({
-        scrollTop: pos-30}, 'fast');
-}
-
+        scrollTop: pos
+    }, 'fast');
 
+}
 // select all checkboxes
 function selectAllHelper(name) {
     $('input:checkbox.'+name+'').each(function () {
@@ -395,4 +395,4 @@ function linkCheckboxes(){
         }
 
     });
-}
+}