codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-04 18:03:45 -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:
George Saines 2014-01-06 11:02:03 -08:00
commit 387eab5592
2 changed files with 3 additions and 2 deletions
app
templates
contribute.jade
views/modal
signup_modal.coffee

2
app/templates/contribute.jade
View file

@ -40,7 +40,7 @@ block content
li Artisans - Sootn, Aftermath, mcdavid1991 li Artisans - Sootn, Aftermath, mcdavid1991
li Scribes - Ryan Faidley li Scribes - Ryan Faidley
li Adventurers - Kieizroe, (...) li Adventurers - Kieizroe, (...)
li Archmages - David Golds, Zach Martin, Tom Steinbrecher, Mischa Lewis-Norelle, Sébastien Moratinos li Archmages - David Golds, Zach Martin, Tom Steinbrecher, Mischa Lewis-Norelle, Sébastien Moratinos, Chloe Fan
div#contribute-main div#contribute-main
div#intro div#intro

3
app/views/modal/signup_modal.coffee
View file

@ -47,8 +47,9 @@ module.exports = class SignupModalView extends View
for key, val of me.attributes when key in ["preferredLanguage", "testGroupNumber", "dateCreated", "wizardColor1", "name", "music", "volume", "emailSubscriptions"] for key, val of me.attributes when key in ["preferredLanguage", "testGroupNumber", "dateCreated", "wizardColor1", "name", "music", "volume", "emailSubscriptions"]
userObject[key] ?= val userObject[key] ?= val
subscribe = @$el.find('#signup-subscribe').prop('checked') subscribe = @$el.find('#signup-subscribe').prop('checked')
userObject.emailSubscriptions ?= []
if subscribe if subscribe
(userObject.emailSubscriptions ?= []).push 'announcement' userObject.emailSubscriptions.push 'announcement' unless 'announcement' in userObject.emailSubscriptions
else else
userObject.emailSubscriptions = _.without (userObject.emailSubscriptions ? []), 'announcement' userObject.emailSubscriptions = _.without (userObject.emailSubscriptions ? []), 'announcement'
res = tv4.validateMultiple userObject, User.schema.attributes res = tv4.validateMultiple userObject, User.schema.attributes