From 06cbe161a758cb71b6468eca729138cf5f7c2dcc Mon Sep 17 00:00:00 2001
From: AlasdairSwan <alasdair_swan@hotmail.com>
Date: Thu, 13 Nov 2014 13:12:36 -0500
Subject: [PATCH] After accessibility review removed required field
 aria-describedby

---
 lms/static/js/student_account/views/FormView.js     | 11 ++---------
 lms/static/js/student_account/views/RegisterView.js |  4 +---
 lms/templates/student_account/form_field.underscore |  9 +++------
 lms/templates/student_account/register.underscore   |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/lms/static/js/student_account/views/FormView.js b/lms/static/js/student_account/views/FormView.js
index e8dcc768a9..5c65006128 100644
--- a/lms/static/js/student_account/views/FormView.js
+++ b/lms/static/js/student_account/views/FormView.js
@@ -28,9 +28,6 @@ var edx = edx || {};
         // String to append to required label fields
         requiredStr: '*',
 
-        // Id of required footnote
-        requiredNote: 'register-footnote',
-
         initialize: function( data ) {
             this.model = data.model;
             this.preRender( data );
@@ -74,8 +71,7 @@ var edx = edx || {};
             var html = [],
                 i,
                 len = data.length,
-                fieldTpl = this.fieldTpl,
-                requiredNote = '';
+                fieldTpl = this.fieldTpl;
 
             this.fields = data;
 
@@ -84,12 +80,9 @@ var edx = edx || {};
                     data[i].errorMessages = this.escapeStrings( data[i].errorMessages );
                 }
 
-                requiredNote = data[i].required ? this.requiredNote : '';
-
                 html.push( _.template( fieldTpl, $.extend( data[i], {
                     form: this.formType,
-                    requiredStr: this.requiredStr,
-                    requiredNote: requiredNote
+                    requiredStr: this.requiredStr
                 }) ) );
             }
 
diff --git a/lms/static/js/student_account/views/RegisterView.js b/lms/static/js/student_account/views/RegisterView.js
index 6f20acaad5..17d5dd3c5f 100644
--- a/lms/static/js/student_account/views/RegisterView.js
+++ b/lms/static/js/student_account/views/RegisterView.js
@@ -18,8 +18,6 @@ var edx = edx || {};
 
         formType: 'register',
 
-        requiredNote: 'register-footnote',
-
         preRender: function( data ) {
             this.providers = data.thirdPartyAuth.providers || [];
             this.currentProvider = data.thirdPartyAuth.currentProvider || '';
@@ -58,6 +56,6 @@ var edx = edx || {};
 
         saveSuccess: function() {
             this.trigger('auth-complete');
-        },
+        }
     });
 })(jQuery, _, gettext);
diff --git a/lms/templates/student_account/form_field.underscore b/lms/templates/student_account/form_field.underscore
index 42925b2ad6..5aa5f11597 100644
--- a/lms/templates/student_account/form_field.underscore
+++ b/lms/templates/student_account/form_field.underscore
@@ -10,8 +10,7 @@
         <select id="<%= form %>-<%= name %>"
             name="<%= name %>"
             class="input-inline"
-            aria-describedby="<%= form %>-<%= name %>-desc <%= requiredNote %>"
-            oninvalid="setCustomValidity(' ')"
+            aria-describedby="<%= form %>-<%= name %>-desc"
             <% if ( required ) { %> aria-required="true" required<% } %>>
         <% _.each(options, function(el) { %>
             <option value="<%= el.value%>"<% if ( el.default ) { %> data-isdefault="true"<% } %>><%= el.name %></option>
@@ -22,8 +21,7 @@
             type="<%= type %>"
             name="<%= name %>"
             class="input-block"
-            aria-describedby="<%= form %>-<%= name %>-desc <%= requiredNote %>"
-            oninvalid="setCustomValidity(' ')"
+            aria-describedby="<%= form %>-<%= name %>-desc"
             <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %>
             <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %>
             <% if ( typeof errorMessages !== 'undefined' ) {
@@ -37,8 +35,7 @@
            type="<%= type %>"
            name="<%= name %>"
            class="input-block <% if ( type === 'checkbox' ) { %>checkbox<% } %>"
-           aria-describedby="<%= form %>-<%= name %>-desc <%= requiredNote %>"
-           oninvalid="setCustomValidity(' ')"
+           aria-describedby="<%= form %>-<%= name %>-desc"
             <% if ( restrictions.min_length ) { %> minlength="<%= restrictions.min_length %>"<% } %>
             <% if ( restrictions.max_length ) { %> maxlength="<%= restrictions.max_length %>"<% } %>
             <% if ( required ) { %> aria-required="true" required<% } %>
diff --git a/lms/templates/student_account/register.underscore b/lms/templates/student_account/register.underscore
index a7a8aba94a..662c31102c 100644
--- a/lms/templates/student_account/register.underscore
+++ b/lms/templates/student_account/register.underscore
@@ -25,5 +25,5 @@
     <%= context.fields %>
 
     <button class="action action-primary action-update js-register register-button"><%- gettext("Register") %></button>
-    <p id="register-footnote" class="note">* <%- gettext("Required field") %></p>
+    <p class="note">* <%- gettext("Required field") %></p>
 </form>