codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-28 15:03:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-02-16 15:30:07 -08:00
commit 2c41d403bc
3 changed files with 12 additions and 11 deletions

12
app/lib/errors.coffee
View file

@ -16,18 +16,18 @@ module.exports.genericFailure = (jqxhr) ->
error = module.exports.parseServerError(jqxhr.responseText) error = module.exports.parseServerError(jqxhr.responseText)
message = error.message message = error.message
message = error.property + ' ' + message if error.property message = error.property + ' ' + message if error.property
res = errorModalTemplate(
status:jqxhr.status
statusText:jqxhr.statusText
message: message
)
console.warn(jqxhr.status, jqxhr.statusText, error) console.warn(jqxhr.status, jqxhr.statusText, error)
existingForm = $('.form-inline:visible:first') existingForm = $('.form:visible:first')
if existingForm[0] if existingForm[0]
missingErrors = applyErrorsToForm(existingForm, [error]) missingErrors = applyErrorsToForm(existingForm, [error])
for error in missingErrors for error in missingErrors
existingForm.append($('<div class="alert"></div>').text(error.message)) existingForm.append($('<div class="alert"></div>').text(error.message))
else else
res = errorModalTemplate(
status:jqxhr.status
statusText:jqxhr.statusText
message: message
)
showErrorModal(res) showErrorModal(res)
module.exports.backboneFailure = (model, jqxhr, options) -> module.exports.backboneFailure = (model, jqxhr, options) ->

10
app/views/kinds/CocoView.coffee
View file

@ -144,12 +144,14 @@ module.exports = class CocoView extends Backbone.View
# Loading ModalViews # Loading ModalViews
enableModalInProgress: (modal) -> enableModalInProgress: (modal) ->
$('> div', modal).hide() el = modal.find('.modal-content')
$('.wait', modal).show() el.find('> div', modal).hide()
el.find('.wait', modal).show()
disableModalInProgress: (modal) -> disableModalInProgress: (modal) ->
$('> div', modal).show() el = modal.find('.modal-content')
$('.wait', modal).hide() el.find('> div', modal).show()
el.find('.wait', modal).hide()
# Subscriptions # Subscriptions

1
app/views/modal/login_modal.coffee
View file

@ -36,7 +36,6 @@ module.exports = class LoginModalView extends View
loginAccount: (e) => loginAccount: (e) =>
forms.clearFormAlerts(@$el) forms.clearFormAlerts(@$el)
userObject = forms.formToObject @$el userObject = forms.formToObject @$el
# res = validateUser(userObject)
res = tv4.validateMultiple userObject, User.schema.attributes res = tv4.validateMultiple userObject, User.schema.attributes
return forms.applyErrorsToForm(@$el, res.errors) unless res.valid return forms.applyErrorsToForm(@$el, res.errors) unless res.valid
@enableModalInProgress(@$el) # TODO: part of forms @enableModalInProgress(@$el) # TODO: part of forms