fixed merge conflicts due to comments

code-dot-org · Jul 19, 2021 · 5b34032 · 5b34032
1 parent 7c20a9e
commit 5b34032
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/apps/src/sites/studio/pages/devise/registrations/_finish_sign_up.js b/apps/src/sites/studio/pages/devise/registrations/_finish_sign_up.js
@@ -122,12 +122,11 @@ $(document).ready(() => {
     setUserType('student');
   });
   // Keep if sign-up user type experiment favors variant (end)
-  // Keep if sign-up user type experiment favors original (start)
+  // Keep if sign-up user type experiment favors original (just the below function))
   $('#user_user_type').change(function() {
     var value = $(this).val();
     setUserType(value);
   });
-  // Keep if sign-up user type experiment favors original (end)
 
   function getUserType() {
     return $('#user_user_type').val();

diff --git a/dashboard/app/views/devise/registrations/_finish_sign_up.html.haml b/dashboard/app/views/devise/registrations/_finish_sign_up.html.haml
@@ -162,23 +162,20 @@
 :javascript
   const teacherButton = document.getElementById('select-user-type-teacher');
   const studentButton = document.getElementById('select-user-type-student');
-
   // Selects 'Teacher' as the user type
   function selectUserTypeTeacher() {
     selectUserType('selectUserTypeTeacher');
     // Style the selected button
     teacherButton.classList.add('select-user-type-button-selected');
     studentButton.classList.remove('select-user-type-button-selected');
   }
-
   // Selects 'Student' as the user type
   function selectUserTypeStudent() {
     selectUserType('selectUserTypeStudent');
     // Style the selected button
     studentButton.classList.add('select-user-type-button-selected');
     teacherButton.classList.remove('select-user-type-button-selected');
   }
-
   // Selects user type by creating and dispatching an event with the given name.
   // (Listener for these events is located in _finish_sign_up.js)
   function selectUserType(selectUserEventName) {