@@ -85,20 +85,15 @@ function getSearchElement() {
8585 return document . getElementById ( "search" ) ;
8686}
8787
88- function getThemesElementId ( ) {
89- return "theme-choices" ;
90- }
88+ var THEME_PICKER_ELEMENT_ID = "theme-picker" ;
89+ var THEMES_ELEMENT_ID = "theme-choices" ;
9190
9291function getThemesElement ( ) {
93- return document . getElementById ( getThemesElementId ( ) ) ;
94- }
95-
96- function getThemePickerElementId ( ) {
97- return "theme-picker" ;
92+ return document . getElementById ( THEMES_ELEMENT_ID ) ;
9893}
9994
10095function getThemePickerElement ( ) {
101- return document . getElementById ( getThemePickerElementId ( ) ) ;
96+ return document . getElementById ( THEME_PICKER_ELEMENT_ID ) ;
10297}
10398
10499// Returns the current URL without any query parameter or hash.
@@ -152,11 +147,11 @@ function hideThemeButtonState() {
152147 var active = document . activeElement ;
153148 var related = e . relatedTarget ;
154149
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 ) &&
157152 ( ! 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 ) ) ) ) {
160155 hideThemeButtonState ( ) ;
161156 }
162157 }
@@ -534,7 +529,7 @@ function hideThemeButtonState() {
534529 switch ( getVirtualKey ( ev ) ) {
535530 case "ArrowUp" :
536531 ev . preventDefault ( ) ;
537- if ( active . previousElementSibling && ev . target . id !== getThemePickerElementId ( ) ) {
532+ if ( active . previousElementSibling && ev . target . id !== THEME_PICKER_ELEMENT_ID ) {
538533 active . previousElementSibling . focus ( ) ;
539534 } else {
540535 showThemeButtonState ( ) ;
@@ -543,7 +538,7 @@ function hideThemeButtonState() {
543538 break ;
544539 case "ArrowDown" :
545540 ev . preventDefault ( ) ;
546- if ( active . nextElementSibling && ev . target . id !== getThemePickerElementId ( ) ) {
541+ if ( active . nextElementSibling && ev . target . id !== THEME_PICKER_ELEMENT_ID ) {
547542 active . nextElementSibling . focus ( ) ;
548543 } else {
549544 showThemeButtonState ( ) ;
@@ -553,7 +548,7 @@ function hideThemeButtonState() {
553548 case "Enter" :
554549 case "Return" :
555550 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" ) {
557552 ev . preventDefault ( ) ;
558553 showThemeButtonState ( ) ;
559554 themes . firstElementChild . focus ( ) ;
0 commit comments