@@ -85,20 +85,15 @@ function getSearchElement() {
85
85
return document . getElementById ( "search" ) ;
86
86
}
87
87
88
- function getThemesElementId ( ) {
89
- return "theme-choices" ;
90
- }
88
+ var THEME_PICKER_ELEMENT_ID = "theme-picker" ;
89
+ var THEMES_ELEMENT_ID = "theme-choices" ;
91
90
92
91
function getThemesElement ( ) {
93
- return document . getElementById ( getThemesElementId ( ) ) ;
94
- }
95
-
96
- function getThemePickerElementId ( ) {
97
- return "theme-picker" ;
92
+ return document . getElementById ( THEMES_ELEMENT_ID ) ;
98
93
}
99
94
100
95
function getThemePickerElement ( ) {
101
- return document . getElementById ( getThemePickerElementId ( ) ) ;
96
+ return document . getElementById ( THEME_PICKER_ELEMENT_ID ) ;
102
97
}
103
98
104
99
// Returns the current URL without any query parameter or hash.
@@ -152,11 +147,11 @@ function hideThemeButtonState() {
152
147
var active = document . activeElement ;
153
148
var related = e . relatedTarget ;
154
149
155
- if ( active . id !== getThemePickerElementId ( ) &&
156
- ( ! active . parentNode || active . parentNode . id !== getThemesElementId ( ) ) &&
150
+ if ( active . id !== THEME_PICKER_ELEMENT_ID &&
151
+ ( ! active . parentNode || active . parentNode . id !== THEMES_ELEMENT_ID ) &&
157
152
( ! related ||
158
- ( related . id !== getThemePickerElementId ( ) &&
159
- ( ! related . parentNode || related . parentNode . id !== getThemesElementId ( ) ) ) ) ) {
153
+ ( related . id !== THEME_PICKER_ELEMENT_ID &&
154
+ ( ! related . parentNode || related . parentNode . id !== THEMES_ELEMENT_ID ) ) ) ) {
160
155
hideThemeButtonState ( ) ;
161
156
}
162
157
}
@@ -534,7 +529,7 @@ function hideThemeButtonState() {
534
529
switch ( getVirtualKey ( ev ) ) {
535
530
case "ArrowUp" :
536
531
ev . preventDefault ( ) ;
537
- if ( active . previousElementSibling && ev . target . id !== getThemePickerElementId ( ) ) {
532
+ if ( active . previousElementSibling && ev . target . id !== THEME_PICKER_ELEMENT_ID ) {
538
533
active . previousElementSibling . focus ( ) ;
539
534
} else {
540
535
showThemeButtonState ( ) ;
@@ -543,7 +538,7 @@ function hideThemeButtonState() {
543
538
break ;
544
539
case "ArrowDown" :
545
540
ev . preventDefault ( ) ;
546
- if ( active . nextElementSibling && ev . target . id !== getThemePickerElementId ( ) ) {
541
+ if ( active . nextElementSibling && ev . target . id !== THEME_PICKER_ELEMENT_ID ) {
547
542
active . nextElementSibling . focus ( ) ;
548
543
} else {
549
544
showThemeButtonState ( ) ;
@@ -553,7 +548,7 @@ function hideThemeButtonState() {
553
548
case "Enter" :
554
549
case "Return" :
555
550
case "Space" :
556
- if ( ev . target . id === getThemePickerElementId ( ) && themes . style . display === "none" ) {
551
+ if ( ev . target . id === THEME_PICKER_ELEMENT_ID && themes . style . display === "none" ) {
557
552
ev . preventDefault ( ) ;
558
553
showThemeButtonState ( ) ;
559
554
themes . firstElementChild . focus ( ) ;
0 commit comments