1
0
mirror of https://github.com/picocms/pico-theme.git synced 2025-07-29 04:50:55 +02:00

Merge branch 'master' into pico-3.0-alpha

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Daniel Rudolf
2020-12-24 17:55:17 +01:00
2 changed files with 29 additions and 8 deletions

View File

@@ -8,6 +8,23 @@ Pico Default Theme Changelog
refer to both the UPGRADE and NEWS sections of the docs for more refer to both the UPGRADE and NEWS sections of the docs for more
details. details.
### Version 2.1.4
Released: 2020-08-29
```
* [Changed] Don't setup nav toggle JavaScript when there's no menu
```
### Version 2.1.3
Released: 2020-07-10
No changes
### Version 2.1.2
Released: 2020-04-10
No changes
### Version 3.0.0-alpha.1 ### Version 3.0.0-alpha.1
Released: 2020-03-29 Released: 2020-03-29

View File

@@ -28,10 +28,12 @@ function main()
// responsive menu // responsive menu
var menu = document.getElementById('nav'), var menu = document.getElementById('nav'),
menuToggle = document.getElementById('nav-toggle'), menuToggle = document.getElementById('nav-toggle');
toggleMenuEvent = function (event) {
if (menu && menuToggle) {
function toggleMenuEvent(event) {
if (event.type === 'keydown') { if (event.type === 'keydown') {
if ((event.keyCode != 13) && (event.keyCode != 32)) { if ((event.keyCode !== 13) && (event.keyCode !== 32)) {
return; return;
} }
} }
@@ -49,8 +51,9 @@ function main()
menuToggle.setAttribute('aria-expanded', 'false'); menuToggle.setAttribute('aria-expanded', 'false');
utils.slideUp(menu); utils.slideUp(menu);
} }
}, }
onResizeEvent = function () {
function onResizeEvent() {
if (utils.isElementVisible(menuToggle)) { if (utils.isElementVisible(menuToggle)) {
menu.className = 'hidden'; menu.className = 'hidden';
menuToggle.addEventListener('click', toggleMenuEvent); menuToggle.addEventListener('click', toggleMenuEvent);
@@ -61,10 +64,11 @@ function main()
menuToggle.removeEventListener('click', toggleMenuEvent); menuToggle.removeEventListener('click', toggleMenuEvent);
menuToggle.removeEventListener('keydown', toggleMenuEvent); menuToggle.removeEventListener('keydown', toggleMenuEvent);
} }
}; }
window.addEventListener('resize', onResizeEvent); window.addEventListener('resize', onResizeEvent);
onResizeEvent(); onResizeEvent();
} }
}
main(); main();