From 84eaf88d6836d730ef89d1433233a5f21d36ebb4 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 18 Jun 2014 10:04:12 -0400
Subject: [PATCH] Fixed smart scrolling as intended for svg divs.  refs #2919

---
 apps/workbench/app/assets/javascripts/sizing.js   | 15 +++++++--------
 .../app/assets/stylesheets/application.css.scss   |  1 +
 .../app/views/application/_svg_div.html.erb       |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/workbench/app/assets/javascripts/sizing.js b/apps/workbench/app/assets/javascripts/sizing.js
index 640893fe0c..3d60274439 100644
--- a/apps/workbench/app/assets/javascripts/sizing.js
+++ b/apps/workbench/app/assets/javascripts/sizing.js
@@ -11,20 +11,19 @@ function graph_zoom(divId, svgId, scale) {
 }
 
 function smart_scroll_fixup(s) {
-    //console.log(s);
+
     if (s != null && s.type == 'shown.bs.tab') {
         s = [s.target];
     }
     else {
         s = $(".smart-scroll");
     }
-    //console.log(s);
-    for (var i = 0; i < s.length; i++) {
-        a = s[i];
-        var h = window.innerHeight - a.getBoundingClientRect().top - 20;
+
+    s.each(function(i, a) {
+        var h = window.innerHeight - $(a).offset().top;
         height = String(h) + "px";
-        a.style['max-height'] = height;
-    }
+        $(a).css('max-height', height);
+    });
 }
 
-$(window).on('load resize scroll', smart_scroll_fixup);
+$(window).on('load ready resize scroll ajax:complete', smart_scroll_fixup);
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 4fea7aebc0..da958e1564 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -134,6 +134,7 @@ nav.navbar-fixed-top .navbar-nav.navbar-right > li > a:hover {
 
 .smart-scroll {
     overflow: auto;
+    margin-bottom: -15px;
 }
 
 .inline-progress-container div.progress {
diff --git a/apps/workbench/app/views/application/_svg_div.html.erb b/apps/workbench/app/views/application/_svg_div.html.erb
index b35d7068bc..76bedba65b 100644
--- a/apps/workbench/app/views/application/_svg_div.html.erb
+++ b/apps/workbench/app/views/application/_svg_div.html.erb
@@ -24,7 +24,7 @@ stroke-linecap: round;
     });
 <% end %>
 
-<div id="_<%= divId %>_container" style="padding-top: 41px; margin-top: -41px">
+<div id="_<%= divId %>_container">
   <div style="text-align: right">
     <a style="cursor: pointer"><span class="glyphicon glyphicon-zoom-out" onclick="graph_zoom('<%= divId %>', '<%= svgId %>', .9)"></span></a>
     <a style="cursor: pointer"><span class="glyphicon glyphicon-zoom-in" onclick="graph_zoom('<%= divId %>', '<%= svgId %>', 1./.9)"></span></a>
@@ -34,5 +34,4 @@ stroke-linecap: round;
     <span id="_<%= divId %>_center" style="padding-left: 0px"></span>
     <%= raw(svg) %>
   </div>
-  <div id="_<%= divId %>_padding" style="padding-bottom: 1em"></div>
 </div>
-- 
2.30.2