codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turned off saving automatically when you toggle subscriptions in the AccountSettingsView, as it was triggering the PlayAccountModal to save and close.

Browse source
This commit is contained in:
Scott Erickson 2014-11-25 13:32:43 -08:00
parent 0f29e098cc
commit 464f06c031
2 changed files with 10 additions and 11 deletions

1
app/views/account/AccountSettingsView.coffee
View file

@ -43,7 +43,6 @@ module.exports = class AccountSettingsView extends CocoView
toggleEmailSubscriptions: => toggleEmailSubscriptions: =>
subs = @getSubscriptions() subs = @getSubscriptions()
$('#email-panel input[type="checkbox"]', @$el).prop('checked', not _.any(_.values(subs))).addClass('changed') $('#email-panel input[type="checkbox"]', @$el).prop('checked', not _.any(_.values(subs))).addClass('changed')
@save()
checkNameExists: => checkNameExists: =>
name = $('#name', @$el).val() name = $('#name', @$el).val()

20
app/views/play/modal/PlayAccountModal.coffee
View file

@ -35,19 +35,19 @@ module.exports = class PlayAccountModal extends ModalView
onInputChanged: -> onInputChanged: ->
@$el.find('#save-button') @$el.find('#save-button')
.text($.i18n.t('common.save', defaultValue: 'Save')) .text($.i18n.t('common.save', defaultValue: 'Save'))
.addClass 'btn-info' .addClass 'btn-info'
.removeClass 'disabled btn-danger' .removeClass 'disabled btn-danger'
.removeAttr 'disabled' .removeAttr 'disabled'
onUserSaveBegan: -> onUserSaveBegan: ->
@$el.find('#save-button') @$el.find('#save-button')
.text($.i18n.t('common.saving', defaultValue: 'Saving...')) .text($.i18n.t('common.saving', defaultValue: 'Saving...'))
.removeClass('btn-danger') .removeClass('btn-danger')
.addClass('btn-success').show() .addClass('btn-success').show()
onUserSaveError: -> onUserSaveError: ->
@$el.find('#save-button') @$el.find('#save-button')
.text($.i18n.t('account_settings.error_saving', defaultValue: 'Error Saving')) .text($.i18n.t('account_settings.error_saving', defaultValue: 'Error Saving'))
.removeClass('btn-success') .removeClass('btn-success')
.addClass('btn-danger', 500) .addClass('btn-danger', 500)