Skip to content

Commit

Permalink
Typos in mediaLesson and interactiveVideo caused non-scrollling results
Browse files Browse the repository at this point in the history
page

 - These pages set x_pageHolder overflow to hidden, and did not set it
   back to auto. Any page after the pages cannot scroll anymore
  • Loading branch information
torinfo committed Sep 8, 2021
1 parent 158638b commit add344c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
Expand Up @@ -77,6 +77,7 @@
var zoomLevel = window.devicePixelRatio;
var zoomCorrection = -1/zoomLevel;
// make sure no scroll bars are on screen during panel sizing
var curroverflow = $x_pageHolder.css("overflow");
$x_pageHolder.css("overflow", "hidden");
var numTileH = $("#panelHolder .panel.tileH").length,
numTileV = $("#panelHolder .panel.tileV").length;
Expand Down Expand Up @@ -109,7 +110,7 @@
$panelHolder.find(".panel.halfH")
.height(Math.floor(($x_mainHolder.height() - $x_headerBlock.height() - $x_footerBlock.height() - (parseFloat($x_pageDiv.css("padding-top")) * 2) - (parseFloat($panelHolder.find(".panel.halfH").css("padding-top")) * 4) - parseInt($panelHolder.find(".panel.halfH").css("margin-bottom"))) / 2) - 2);

$x_pageHolder.css("overflow", "hidden");
$x_pageHolder.css("overflow", curroverflow);

this.resizeMedia();
};
Expand Down
Expand Up @@ -92,6 +92,7 @@
var zoomLevel = window.devicePixelRatio;
var zoomCorrection = -1/zoomLevel;
// make sure no scroll bars are on screen during panel sizing
var curroverflow = $x_pageHolder.css("overflow");
$x_pageHolder.css("overflow", "hidden");
var numTileH = $("#panelHolder .panel.tileH").length,
numTileV = $("#panelHolder .panel.tileV").length;
Expand Down Expand Up @@ -124,7 +125,7 @@
$panelHolder.find(".panel.halfH")
.height(Math.floor(($x_mainHolder.height() - $x_headerBlock.height() - $x_footerBlock.height() - (parseFloat($x_pageDiv.css("padding-top")) * 2) - (parseFloat($panelHolder.find(".panel.halfH").css("padding-top")) * 4) - parseInt($panelHolder.find(".panel.halfH").css("margin-bottom"))) / 2) - 2);

$x_pageHolder.css("overflow", "hidden");
$x_pageHolder.css("overflow", curroverflow);

this.resizeMedia();
};
Expand Down

0 comments on commit add344c

Please sign in to comment.