From 52af9b5fe30acdf022b432ed84e035f14962b7e5 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 29 Mar 2020 16:04:04 +0200 Subject: [PATCH 1/8] Add composer.json branch alias for Pico 3.0 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e46621a..f537ba1 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ "extra": { "installer-name": "default", "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.1.x-dev", + "dev-pico-3.0": "3.0.x-dev" } } } From 622396045dcc5acab4ddfecec5add5d22e129c5e Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Fri, 10 Apr 2020 23:20:33 +0200 Subject: [PATCH 2/8] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4564e49..d1a323a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ Pico Default Theme Changelog refer to both the UPGRADE and NEWS sections of the docs for more details. +### Version 2.1.2 +Released: 2020-04-10 + +No changes + ### Version 2.1.1 Released: 2019-12-31 From 9154fcaeb7ba11f12cebfedecbad5c6efde830fb Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Fri, 10 Apr 2020 23:20:37 +0200 Subject: [PATCH 3/8] Version 2.1.2 No changes From 8b606f6df70463e02f2a5b9493912e356193ad47 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Fri, 10 Jul 2020 18:19:23 +0200 Subject: [PATCH 4/8] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1a323a..3950e36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ Pico Default Theme Changelog refer to both the UPGRADE and NEWS sections of the docs for more details. +### Version 2.1.3 +Released: 2020-07-10 + +No changes + ### Version 2.1.2 Released: 2020-04-10 From e385f2ba0e857222526d518d8b6c98d56cde3f86 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Fri, 10 Jul 2020 18:19:26 +0200 Subject: [PATCH 5/8] Version 2.1.3 No changes From 6821662127a7959fb9a1bd2e702333984fe6a85b Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 29 Aug 2020 17:07:41 +0200 Subject: [PATCH 6/8] JavaScript: Don't setup nav toggle when there's no menu --- js/pico.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/js/pico.js b/js/pico.js index 4ddb6ad..7f5449b 100644 --- a/js/pico.js +++ b/js/pico.js @@ -28,10 +28,12 @@ function main() // responsive menu var menu = document.getElementById('nav'), - menuToggle = document.getElementById('nav-toggle'), - toggleMenuEvent = function (event) { + menuToggle = document.getElementById('nav-toggle'); + + if (menu && menuToggle) { + function toggleMenuEvent(event) { if (event.type === 'keydown') { - if ((event.keyCode != 13) && (event.keyCode != 32)) { + if ((event.keyCode !== 13) && (event.keyCode !== 32)) { return; } } @@ -49,8 +51,9 @@ function main() menuToggle.setAttribute('aria-expanded', 'false'); utils.slideUp(menu); } - }, - onResizeEvent = function () { + } + + function onResizeEvent() { if (utils.isElementVisible(menuToggle)) { menu.className = 'hidden'; menuToggle.addEventListener('click', toggleMenuEvent); @@ -61,10 +64,11 @@ function main() menuToggle.removeEventListener('click', toggleMenuEvent); menuToggle.removeEventListener('keydown', toggleMenuEvent); } - }; + } - window.addEventListener('resize', onResizeEvent); - onResizeEvent(); + window.addEventListener('resize', onResizeEvent); + onResizeEvent(); + } } main(); From ca41b7b91aa1e9c6f48f4211097a1d341b62e994 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 29 Aug 2020 17:11:36 +0200 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3950e36..a171f5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ Pico Default Theme Changelog refer to both the UPGRADE and NEWS sections of the docs for more 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 From d4ec8df28356f1e034a97d37327b9aecb3129eed Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 29 Aug 2020 17:11:43 +0200 Subject: [PATCH 8/8] Version 2.1.4 ``` * [Changed] Don't setup nav toggle JavaScript when there's no menu ```