Skip to content

[4.0]fix error of twice clicking on toolbar and its disappearance on resizing #27958

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

Closed
Subhang23 wants to merge 9 commits into from
Closed

[4.0]fix error of twice clicking on toolbar and its disappearance on resizing #27958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
850aef7
fix error of twice clicking on toolbar
Subhang23 Feb 17, 2020
ee21a8f
reappearance of toolbar by setting default state to collapsed
Subhang23 Feb 17, 2020
883a59d
disappearing toolbar on resizing
Subhang23 Feb 17, 2020
a02351f
fix issue of screen size in between desktop and mobile
Subhang23 Feb 17, 2020
9d0e085
changing query selectors
Subhang23 Feb 18, 2020
9cedeba
changed name of id
Subhang23 Feb 19, 2020
369f3a4
improve performance
Subhang23 Feb 19, 2020
42dac1d
changed position of query selector
Subhang23 Feb 19, 2020
32c00cb
fixed permissions
Subhang23 Apr 3, 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
6 changes: 3 additions & 3 deletions administrator/templates/atum/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@
<?php endif; ?>

<?php // container-fluid ?>
<div class="container-fluid container-main">
<div class="container-fluid container-main" id="main-container">
<?php if (!$cpanel) : ?>
<?php // Subheader ?>
<button class="navbar-toggler toggler-toolbar toggler-burger collapsed" type="button" data-toggle="collapse" data-target=".subhead" aria-controls="subhead" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOOLBAR'); ?>">
<button class="navbar-toggler toggler-toolbar toggler-burger" type="button" data-toggle="collapse" data-target=".subhead" aria-controls="subhead" aria-expanded="false" aria-label="<?php echo Text::_('TPL_ATUM_TOOLBAR'); ?>">
<span class="toggler-toolbar-icon"></span>
</button>
<div id="subhead" class="subhead mb-3">
<div id="subhead" class="subhead mb-3 collapse show">
<div id="container-collapse" class="container-collapse"></div>
<div class="row">
<div class="col-md-12">
Expand Down
8 changes: 8 additions & 0 deletions build/media_source/templates/atum/js/template.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,15 @@
* @since 4.0.0
*/
function reactToResize() {
const toolbar = doc.getElementById('main-container');
window.addEventListener('resize', () => {
if (window.innerWidth >= 576) {
if (toolbar && !toolbar.querySelector('#subhead').classList.contains('show')) {
Copy link
Contributor

@wilsonge wilsonge Apr 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In cpanel #subhead doesn't exist and this causes a JS error getting the property classList of null

toolbar.querySelector('#subhead').classList.add('show');
toolbar.querySelector('.toggler-toolbar').setAttribute('aria-expanded', 'true');
toolbar.querySelector('.toggler-toolbar').classList.remove('collapsed');
}
}
if (mobile.matches) {
setMobile();
} else {
Expand Down