From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 23 Apr 2015 21:35:09 +0000 (-0400)
Subject: webstaff: Double scrollbars are bad, this stops them where we can.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3599de4e3571fe292d703f0a5ed83effbb544583;p=Evergreen.git

webstaff: Double scrollbars are bad, this stops them where we can.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

diff --git a/Open-ILS/web/js/ui/default/staff/services/eframe.js b/Open-ILS/web/js/ui/default/staff/services/eframe.js
index fec41b7437..a1f0c8779b 100644
--- a/Open-ILS/web/js/ui/default/staff/services/eframe.js
+++ b/Open-ILS/web/js/ui/default/staff/services/eframe.js
@@ -35,7 +35,7 @@ angular.module('egCoreMod')
             function($scope , $window , $location , $q , $timeout , egCore) {
 
             $scope.save_space = $scope.saveSpace ? $scope.saveSpace : 300;
-            // Set the iframe height to just under the window height.
+            // Set the initial iframe height to just under the window height.
             // leave room for the navbar, padding, margins, etc.
             $scope.height = $window.outerHeight - $scope.save_space;
 
@@ -77,6 +77,9 @@ angular.module('egCoreMod')
 
                 $scope.frame = {dom:iframe};
 
+                // Reset the iframe height to the final content height.
+                $scope.height = $scope.frame.dom.contentWindow.document.body.scrollHeight;
+
                 var page = iframe.contentWindow.location.href;
                 console.debug('egEmbedFrameLoader(): ' + page);