From 16b1337d6700548a017256286b0cb246daa1e9b4 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 12 Feb 2021 18:54:42 +0900 Subject: [PATCH] Add WAI-ARIA attributes to menu --- plume-front/src/lib.rs | 12 ++++++++++-- templates/base.rs.html | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plume-front/src/lib.rs b/plume-front/src/lib.rs index 74c3557d..191a3397 100755 --- a/plume-front/src/lib.rs +++ b/plume-front/src/lib.rs @@ -101,7 +101,11 @@ fn menu() { let show_menu = Closure::wrap(Box::new(|_: TouchEvent| { self::document() .get_element_by_id("menu") - .map(|menu| menu.class_list().add_1("show")) + .map(|menu| { + menu.set_attribute("aria-expanded", "true") + .map(|_| menu.class_list().add_1("show")) + }) + .unwrap() .unwrap() .unwrap(); }) as Box); @@ -113,7 +117,11 @@ fn menu() { let close_menu = Closure::wrap(Box::new(|_: TouchEvent| { self::document() .get_element_by_id("menu") - .map(|menu| menu.class_list().remove_1("show")) + .map(|menu| { + menu.set_attribute("aria-expanded", "false") + .map(|_| menu.class_list().remove_1("show")) + }) + .unwrap() .unwrap() .unwrap() }) as Box); diff --git a/templates/base.rs.html b/templates/base.rs.html index 801cd670..115ea4e7 100644 --- a/templates/base.rs.html +++ b/templates/base.rs.html @@ -21,9 +21,9 @@
-
+