Factor out user title handling code

This ensures all the various SubmitView subclasses set the user
title, if required.

Fixes #156.

1 files changed, 23 insertions, 18 deletions

diff --git a/www/js/views/submit.js b/www/js/views/submit.js
index ec89928..4d38aa3 100644
--- a/www/js/views/submit.js
+++ b/www/js/views/submit.js
@@ -128,6 +128,22 @@
                 }
             },
 
+            validateUserTitle: function() {
+                if ( this.model.get('titles_list') && this.model.get('titles_list').length > 0 ) {
+                    if ( $('#form_title').val() === '' ) {
+                        this.validationError('form_title', FMS.strings.required);
+                        return false;
+                    }
+                }
+                return true;
+            },
+
+            setUserTitle: function() {
+                if ( this.model.get('titles_list') && this.model.get('titles_list').length > 0 ) {
+                    FMS.currentUser.set('title', $('#form_title').val());
+                }
+            },
+
             beforeSubmit: function() {},
             afterSubmit: function() {},
 
@@ -265,11 +281,8 @@
                     }
                 }
 
-                if ( this.model.get('titles_list') && this.model.get('titles_list').length > 0 ) {
-                    if ( $('#form_title').val() === '' ) {
-                        this.validationError('form_title', FMS.strings.required);
-                        isValid = 0;
-                    }
+                if (!this.validateUserTitle()) {
+                    isValid = 0;
                 }
 
                 return isValid;
@@ -283,10 +296,7 @@
                 this.model.set('may_show_name', $('#form_may_show_name').is(':checked'));
                 FMS.currentUser.set('name', $('#form_name').val());
                 FMS.currentUser.set('may_show_name', $('#form_may_show_name').is(':checked'));
-
-                if ( this.model.get('titles_list') && this.model.get('titles_list').length > 0 ) {
-                    FMS.currentUser.set('title', $('#form_title').val());
-                }
+                this.setUserTitle();
 
                 if ( FMS.currentUser ) {
                     FMS.currentUser.save();
@@ -337,13 +347,9 @@
                     this.validationError('form_password', FMS.validationStrings.password );
                 }
 
-                if ( $('#form_name').val() && this.model.get('titles_list') && this.model.get('titles_list').length > 0 ) {
-                    if ( $('#form_title').val() === '' ) {
-                        this.validationError('form_title', FMS.strings.required);
-                        isValid = 0;
-                    }
+                if ($('#form_name').val() && !this.validateUserTitle()) {
+                    isValid = 0;
                 }
-
                 return isValid;
             },
 
@@ -358,9 +364,7 @@
                     this.model.set('may_show_name', $('#form_may_show_name').is(':checked'));
                     FMS.currentUser.set('name', $('#form_name').val());
                     FMS.currentUser.set('may_show_name', $('#form_may_show_name').is(':checked'));
-                    if ( this.model.get('titles_list') && this.model.get('titles_list').length > 0 ) {
-                        FMS.currentUser.set('title', $('#form_title').val());
-                    }
+                    this.setUserTitle();
                     FMS.currentUser.save();
                 } else {
                     // if this is set then we are registering a password
@@ -463,6 +467,7 @@
                 this.model.set('submit_clicked', 'submit_register');
                 FMS.currentUser.set('name', $('#form_name').val());
                 FMS.currentUser.set('may_show_name', $('#form_may_show_name').is(':checked'));
+                this.setUserTitle();
             },
 
             onReportError: function(model, err, options) {