Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vertical scrollbar (for unit tests) #599

Closed
wants to merge 14 commits into from
Closed

Remove vertical scrollbar (for unit tests) #599

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
369d80c
Fixed extra vertical scrollbar appearing
ab1nash Oct 30, 2019
3eee053
Correct calculation of iframe height
Jaifroid Mar 4, 2020
8bd2cf3
Revert change to CSS
Jaifroid Mar 4, 2020
e69590d
Use computed styles
Jaifroid Mar 4, 2020
e2f6aa4
Calculate all values
Jaifroid Mar 4, 2020
a68e128
Add timeouts to compensate for timeouts in applyAnimationToSection
Jaifroid Mar 5, 2020
d1d6fd1
Clean up
Jaifroid Mar 5, 2020
2b1ff38
Workaround for IE11
Jaifroid Mar 5, 2020
e0446b1
Document code more clearly
Jaifroid Mar 5, 2020
2640c78
Avoid using outerHeight
Jaifroid Mar 8, 2020
fb20bf8
Set overflowY explicitly
Jaifroid Mar 14, 2020
1de4ad3
Comment out overflowY statements for testing
Jaifroid Mar 22, 2020
144571b
Remove commented lines
Jaifroid Mar 22, 2020
191cf2f
Solve improper resizing in SW mode
Jaifroid Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,22 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'cookies','abstractFilesystemAcc
* Resize the IFrame height, so that it fills the whole available height in the window
*/
function resizeIFrame() {
var height = $(window).outerHeight()
- $("#top").outerHeight(true)
// TODO : this 5 should be dynamically computed, and not hard-coded
- 5;
$(".articleIFrame").css("height", height + "px");
var headerStyles = getComputedStyle(document.getElementById('top'));
var iframe = document.getElementById('articleContent');
var region = document.getElementById('search-article');
if (iframe.style.display === 'none') {
// We are in About or Configuration, so we only set the region height
region.style.height = window.innerHeight + 'px';
} else {
// IE cannot retrieve computed headerStyles till the next paint, so we wait a few ticks
setTimeout(function() {
// Get header height *including* its bottom margin
var headerHeight = parseFloat(headerStyles.height) + parseFloat(headerStyles.marginBottom);
iframe.style.height = window.innerHeight - headerHeight + 'px';
// We have to allow a minimum safety margin of 10px for 'iframe' and 'header' to fit within 'region'
region.style.height = window.innerHeight + 10 + 'px';
}, 100);
}
}
$(document).ready(resizeIFrame);
$(window).resize(resizeIFrame);
Expand Down Expand Up @@ -250,6 +261,8 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'cookies','abstractFilesystemAcc
$("#welcomeText").hide();
goToMainArticle();
}
// Use a timeout of 400ms because uiUtil.applyAnimationToSection uses a timeout of 300ms
setTimeout(resizeIFrame, 400);
return false;
});
$('#btnConfigure').on('click', function(e) {
Expand All @@ -274,6 +287,8 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'cookies','abstractFilesystemAcc
$('.alert').hide();
refreshAPIStatus();
refreshCacheStatus();
// Use a timeout of 400ms because uiUtil.applyAnimationToSection uses a timeout of 300ms
setTimeout(resizeIFrame, 400);
return false;
});
$('#btnAbout').on('click', function(e) {
Expand All @@ -297,6 +312,8 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'cookies','abstractFilesystemAcc
$('#articleListWithHeader').hide();
$("#searchingArticles").hide();
$('.alert').hide();
// Use a timeout of 400ms because uiUtil.applyAnimationToSection uses a timeout of 300ms
setTimeout(resizeIFrame, 400);
return false;
});
$('input:radio[name=contentInjectionMode]').on('change', function(e) {
Expand Down Expand Up @@ -1067,6 +1084,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'cookies','abstractFilesystemAcc
docBody.addEventListener('dragover', handleIframeDragover);
docBody.addEventListener('drop', handleIframeDrop);
}
resizeIFrame();
// Reset UI when the article is unloaded
if (iframeArticleContent.contentWindow) iframeArticleContent.contentWindow.onunload = function () {
$("#articleList").empty();
Expand Down