Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-15 07:22:28 +02:00
Code Issues Releases Wiki Activity

Maybe fix rare spurious viewport width test in popup panel

Browse Source 
In rare instances -- though it definitely happens
eventually -- the popup panel viewport width is seen as
insufficiently wide enough and as a result the popup panel
is toggled into vertical-layout mode.

The added code uses animation frames to delay the
code testing the viewport width. Hopefully this will
work.
This commit is contained in:
Raymond Hill 2020-05-03 09:18:53 -04:00
parent 1f91e52746
commit a54718862c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/js/popup-fenix.js
View File

@ -1150,10 +1150,21 @@ const getPopupData = async function(tabId) {
tabId = parseInt(matches[1], 10) || 0;
}
const nextFrame = ( ) => {
return new Promise(resolve => {
self.requestAnimationFrame(( ) => { resolve(); });
});
};
// The purpose of the following code is to reset to a vertical layout
// should the viewport be not enough wide to accomodate the horizontal
// should the viewport not be enough wide to accomodate the horizontal
// layout.
const checkViewport = function() {
// To avoid querying a spurious viewport width -- it happens sometimes,
// somehow -- we delay layout-changing operations to the next paint
// frames.
const checkViewport = async function() {
await nextFrame();
const root = document.querySelector(':root');
if ( root.classList.contains('desktop') ) {
const main = document.getElementById('main');
@ -1168,14 +1179,15 @@ const getPopupData = async function(tabId) {
}
}
}
self.requestAnimationFrame(( ) => {
document.body.classList.remove('loading');
});
await nextFrame();
document.body.classList.remove('loading');
};
getPopupData(tabId).then(( ) => {
if ( document.readyState !== 'complete' ) {
self.addEventListener('load', checkViewport, { once: true });
self.addEventListener('load', ( ) => { checkViewport(); }, { once: true });
} else {
checkViewport();
}