In /lib/navbar.jst use HTML5 hidden attribute and remove some other jQuery
authorNick Downing <nick@ndcode.org>
Wed, 26 Jan 2022 11:06:08 +0000 (22:06 +1100)
committerNick Downing <nick@ndcode.org>
Wed, 26 Jan 2022 11:11:52 +0000 (22:11 +1100)
_lib/navbar.jst

index 8a9add1..f9a7682 100644 (file)
@@ -72,19 +72,19 @@ return async (env, head, body, scripts) => {
                 }
                 ' '
                 if (signed_in_as !== undefined)
-                  a#navbar-sign-in(href="#" style="display: none;") {'Sign in'}
+                  a#navbar-sign-in(href="#" hidden) {'Sign in'}
                 else
                   a#navbar-sign-in(href="#") {'Sign in'}
                 ' '
                 if (signed_in_as !== undefined)
-                  a#navbar-sign-up(href="/my_account/sign_up/index.html" style="display: none;") {'Sign up'}
+                  a#navbar-sign-up(href="/my_account/sign_up/index.html" hidden) {'Sign up'}
                 else
                   a#navbar-sign-up(href="/my_account/sign_up/index.html") {'Sign up'}
                 ' '
                 if (signed_in_as !== undefined)
                   a#navbar-sign-out(href="#") {'Sign out'}
                 else
-                  a#navbar-sign-out(href="#" style="display: none;") {'Sign out'}
+                  a#navbar-sign-out(href="#" hidden) {'Sign out'}
               }
 
               form(action="/search/index.html") {
@@ -226,7 +226,7 @@ return async (env, head, body, scripts) => {
               div.row {
                 div.col-md-12 {
                   div.form-group {
-                    label.form-label(for="sign-in-email") {'Email'}
+                    label.form-label(for="navbar-sign-in-email") {'Email'}
                     input.form-control#navbar-sign-in-email(type="text" placeholder="Account email address" required="required" maxlength=256) {}
                   }
                 }
@@ -234,7 +234,7 @@ return async (env, head, body, scripts) => {
               div.row {
                 div.col-md-12 {
                   div.form-group {
-                    label.form-label(for="sign-in-password") {'Password'}
+                    label.form-label(for="navbar-sign-in-password") {'Password'}
                     input.form-control#navbar-sign-in-password(type="password" placeholder="Account password" required="required" minlength=8 maxlength=256) {}
                   }
                 }
@@ -275,7 +275,7 @@ return async (env, head, body, scripts) => {
               div.row {
                 div.col-md-12 {
                   div.form-group {
-                    label.form-label(for="feedback-message") {'Message'}
+                    label.form-label(for="navbar-feedback-message") {'Message'}
                     textarea.form-control#navbar-feedback-message(placeholder="Please tell us your thoughts" required="required" rows=4 maxlength=65536) {}
                   }
                 }
@@ -352,10 +352,7 @@ return async (env, head, body, scripts) => {
 
             $('#navbar-sign-in-modal').on(
               'shown.bs.modal',
-              () => {
-                console.log('bloo')
-                $('#navbar-sign-in-email').focus()
-              }
+              () => {id_navbar_sign_in_email.focus()}
             )
 
             id_navbar_sign_in_submit.addEventListener(
@@ -385,9 +382,9 @@ return async (env, head, body, scripts) => {
                 }
 
                 id_navbar_signed_in_status.textContent = 'Signed in.' //`Signed in as ${email}.`
-                $('#navbar-sign-in').hide()
-                $('#navbar-sign-up').hide()
-                $('#navbar-sign-out').show()
+                id_navbar_sign_in.hidden = true
+                id_navbar_sign_up.hidden = true
+                id_navbar_sign_out.hidden = false
                 sign_in_out(true)
 
                 id_navbar_message_modal_message.textContent = `You are now signed in as "${email}".`
@@ -415,9 +412,9 @@ return async (env, head, body, scripts) => {
                 }
 
                 id_navbar_signed_in_status.textContent = 'Browsing as guest.'
-                $('#navbar-sign-in').show()
-                $('#navbar-sign-up').show()
-                $('#navbar-sign-out').hide()
+                id_navbar_sign_in.hidden = false
+                id_navbar_sign_up.hidden = false
+                id_navbar_sign_out.hidden = true
                 sign_in_out(false)
 
                 id_navbar_message_modal_message.textContent = `You are now signed out.`
@@ -430,7 +427,7 @@ return async (env, head, body, scripts) => {
             id_navbar_give_feedback.addEventListener(
               'click',
               () => {
-                $('#navbar-feedback-message').text('')
+                id_navbar_feedback_message.value = ''
                 $('#navbar-feedback-modal').modal('show')
                 return false
               }
@@ -438,9 +435,7 @@ return async (env, head, body, scripts) => {
 
             $('#navbar-feedback-modal').on(
               'shown.bs.modal',
-              () => {
-                $('#navbar-feedback-message').focus()
-              }
+              () => {id_navbar_feedback_message.focus()}
             )
 
             id_navbar_feedback_submit.addEventListener(