diff options
| author | mo <mo.khan@gmail.com> | 2017-09-08 21:13:29 -0600 |
|---|---|---|
| committer | mo <mo.khan@gmail.com> | 2017-09-08 21:13:29 -0600 |
| commit | 8ae5ab7bd52d78bfcd7d2e9f0c2431778ed966d3 (patch) | |
| tree | 7761b2b30e3698b37032bc811963d664bb272ac8 /app/assets | |
| parent | a26735d60357b9126cf02489f2897e3b8d9376bd (diff) | |
username -> email
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/models/session.js.coffee | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/views/sessions/login_form.js.coffee | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/models/session.js.coffee b/app/assets/javascripts/models/session.js.coffee index 1a513b2c..96a7d390 100644 --- a/app/assets/javascripts/models/session.js.coffee +++ b/app/assets/javascripts/models/session.js.coffee @@ -2,16 +2,16 @@ class CakeSide.Models.Session extends Backbone.Model EMAIL_REGEX=/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/ modelKey: 'session' defaults: - username: null + email: null password: null - requiredFields: ['username', 'password'] + requiredFields: ['email', 'password'] validate: (attributes, options) -> errors = {} - if !EMAIL_REGEX.test(attributes.username) - errors['username'] = @errorFor('username', 'invalid') + if !EMAIL_REGEX.test(attributes.email) + errors['email'] = @errorFor('email', 'invalid') _.each @requiredFields, (field) => if _.isEmpty(attributes[field]) diff --git a/app/assets/javascripts/views/sessions/login_form.js.coffee b/app/assets/javascripts/views/sessions/login_form.js.coffee index 7240bdbe..7363f583 100644 --- a/app/assets/javascripts/views/sessions/login_form.js.coffee +++ b/app/assets/javascripts/views/sessions/login_form.js.coffee @@ -15,7 +15,7 @@ class CakeSide.Views.LoginForm extends CakeSide.AutoView @renderErrors(@model.validationError) onInput: (event) -> - @model.set('username', @field('username').val()) + @model.set('email', @field('email').val()) @model.set('password', @field('password').val()) @$('input[type=submit]').prop('disabled', !@model.isValid()) @render() |