Skip to content

Commit 3a0c94d

Browse files
authored
Merge pull request #799 from CityOfBoston/revert-798-DIG-5557
Revert "(develop) Clean up Javascript; Refactor headers on Boston.gov"
2 parents 71f5830 + 684c3e3 commit 3a0c94d

File tree

2 files changed

+19
-44
lines changed

2 files changed

+19
-44
lines changed

scripts/components/header.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
// This module controls the City of Boston header component
2+
// This module controls the City of Boston newsletter component
33
// ---------------------------
44
var BostonHeader = (function () {
55
var guideTitle;
@@ -78,15 +78,6 @@ var BostonHeader = (function () {
7878

7979
if (burgerckbx) {
8080
burgerckbx.setAttribute("tabIndex", "0");
81-
burgerckbx.addEventListener("click", function (element) {
82-
if (document.getElementById("cob-content").classList.contains('brg-tr--active')) {
83-
document.getElementById("cob-content").classList.remove('brg-tr--active');
84-
}
85-
else {
86-
document.getElementById("cob-content").classList.add('brg-tr--active');
87-
}
88-
});
89-
9081
}
9182

9283
if (searchckbx) {

scripts/components/menu.js

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict'
2-
// This module controls the City of Boston Main RHS Menu
3-
// ---------------------------
2+
43
var BostonMenu = (function () {
54
// Set height
65
var secondaryNavs;
@@ -10,22 +9,21 @@ var BostonMenu = (function () {
109
var backTriggers;
1110
var burger;
1211
var placeholder;
13-
// var navMainmenu;
14-
// var sticky;
12+
var navMainmenu;
13+
var sticky;
1514
var navLogo;
1615
var navFirstItem;
17-
var siteBanner;
1816

1917
// activate class for sticky menu
20-
// function mainMenuonScroll() {
21-
// sticky = navMainmenu.offsetTop;
22-
//
23-
// if (window.pageYOffset > sticky) {
24-
// navMainmenu.classList.add("sticky");
25-
// } else {
26-
// navMainmenu.classList.remove("sticky");
27-
// }
28-
// }
18+
function mainMenuonScroll() {
19+
sticky = navMainmenu.offsetTop;
20+
21+
if (window.pageYOffset > sticky) {
22+
navMainmenu.classList.add("sticky");
23+
} else {
24+
navMainmenu.classList.remove("sticky");
25+
}
26+
}
2927

3028
function handleTrigger(ev, method) {
3129

@@ -71,8 +69,7 @@ var BostonMenu = (function () {
7169

7270
// Update the title
7371
title.innerHTML = trigger.innerHTML;
74-
}
75-
else {
72+
} else {
7673
for (var i = 0; i < listItems.length; i++) {
7774
if (parentItem != listItems[i]) {
7875
listItems[i].classList.remove('nv-m-c-l-i--h');
@@ -95,14 +92,13 @@ var BostonMenu = (function () {
9592

9693
function start() {
9794
burger = document.getElementById('brg-tr');
98-
siteBanner = document.querySelector('.dr-h');
9995
navLogo = document.getElementById('logoImg');
10096
listItems = document.querySelectorAll('.nv-m-c-l-i');
10197
backTriggers = document.querySelectorAll('.nv-m-c-b');
10298
secondaryTriggers = document.querySelectorAll('.nolink');
10399
secondaryNavs = document.querySelectorAll('.nv-m-c-l-l');
104100
secondaryNavItems = document.querySelectorAll('.nv-m-c-a--s');
105-
// navMainmenu = document.getElementById("main-menu");
101+
navMainmenu = document.getElementById("main-menu");
106102
navFirstItem = document.querySelector('.nv-m-h-i');
107103

108104
var title = document.getElementById('nv-m-h-t');
@@ -163,24 +159,12 @@ var BostonMenu = (function () {
163159
secondaryNavItems[i].classList.add('nv-m-c-a--p');
164160
}
165161

166-
// Note when the site_banner is expanded.
167-
if (siteBanner) {
168-
siteBanner.addEventListener("click", function (element) {
169-
if (document.getElementById("cob-content").classList.contains('site-banner--expanded')) {
170-
document.getElementById("cob-content").classList.remove('site-banner--expanded');
171-
}
172-
else {
173-
document.getElementById("cob-content").classList.add('site-banner--expanded');
174-
}
175-
});
162+
if (navMainmenu) {
163+
window.onscroll = function() {
164+
mainMenuonScroll()
165+
};
176166
}
177167

178-
// if (navMainmenu) {
179-
// window.onscroll = function() {
180-
// mainMenuonScroll()
181-
// };
182-
// }
183-
184168
}
185169

186170
return {

0 commit comments

Comments
 (0)