From 618edd2f822f887ad19bea8d131eb302c43f6fee Mon Sep 17 00:00:00 2001
From: Jason Tarka <jason@tarka.ca>
Date: Thu, 15 Mar 2018 17:57:50 -0400
Subject: [PATCH] Fixing errors with registration page

- Couldn't select a logo on Firefox, as the touch-swipe blocks the
  `mouseup` event needed for `click` to work
- Issues showing an error with the password when team names are present
  - The lack of an error text block caused JS errors
  - The password field would not be marked in red
    - `$('.el--text')[1]` would refer to the first email field,
      rather than the password field
---
 src/controllers/IndexController.php |  4 ++++
 src/static/js/index.js              | 10 ++++++----
 src/static/js/slider.js             |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/controllers/IndexController.php b/src/controllers/IndexController.php
index 10f9971f..e7872c0b 100644
--- a/src/controllers/IndexController.php
+++ b/src/controllers/IndexController.php
@@ -468,6 +468,10 @@ class="fb-cta cta--yellow">
               <label for="">{tr('Password')}</label>
               <input autocomplete="off" name="password" type="password" />
             </div>
+            <div id="password_error" class="el--text completely-hidden">
+              <label for=""></label>
+              <h6 style="color:red;">{tr('Password is too simple')}</h6>
+            </div>
             {$token_field}
           </fieldset>
           <div class="fb-choose-emblem">
diff --git a/src/static/js/index.js b/src/static/js/index.js
index ea1b5312..337b2d73 100644
--- a/src/static/js/index.js
+++ b/src/static/js/index.js
@@ -17,14 +17,16 @@ function teamLoginFormError() {
 }
 
 function teamPasswordFormError(toosimple) {
-  $('.el--text')[1].classList.add('form-error');
+  var $passwordError = $('#password_error');
+  var $passwordField = $('input[name="password"]').parent('.el--text');
+  $passwordField.addClass('form-error');
   if (toosimple) {
-    $('#password_error')[0].classList.remove('completely-hidden');
+    $passwordError.removeClass('completely-hidden');
   }
   $('.fb-form input[name="password"]').on('change', function() {
-    $('.el--text')[1].classList.remove('form-error');
+    $passwordField.removeClass('form-error');
     if (toosimple) {
-      $('#password_error')[0].classList.add('completely-hidden');
+      $passwordError.addClass('completely-hidden');
     }
   });
 }
diff --git a/src/static/js/slider.js b/src/static/js/slider.js
index 6e9dc042..5713125e 100644
--- a/src/static/js/slider.js
+++ b/src/static/js/slider.js
@@ -13,7 +13,8 @@ module.exports = {
       pager: false,
       minSlides: 2,
       maxSlides: 5,
-      moveSlides: 1
+      moveSlides: 1,
+      touchEnabled: false
     });
   }
 };