codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-02 00:43:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temporary workaround for . Identifying ageRange. Made poll header slightly smaller.

Browse source
This commit is contained in:
Nick Winter 2015-03-11 20:21:45 -07:00
parent 2a2a187467
commit 3458f2069b
4 changed files with 4 additions and 4 deletions
app
core
Tracker.coffee
styles/play/modal
poll-modal.sass
templates/play/modal
poll-modal.jade
views/play/level/tome
SpellView.coffee

2
app/core/Tracker.coffee
View file

@ -34,7 +34,7 @@ module.exports = class Tracker
@explicitTraits ?= {} @explicitTraits ?= {}
@explicitTraits[key] = value for key, value of traits @explicitTraits[key] = value for key, value of traits
for userTrait in ['email', 'anonymous', 'dateCreated', 'name', 'testGroupNumber', 'gender', 'lastLevel', 'siteref'] for userTrait in ['email', 'anonymous', 'dateCreated', 'name', 'testGroupNumber', 'gender', 'lastLevel', 'siteref', 'ageRange']
traits[userTrait] ?= me.get(userTrait) traits[userTrait] ?= me.get(userTrait)
console.log 'Would identify', traits if debugAnalytics console.log 'Would identify', traits if debugAnalytics
return unless @isProduction and not me.isAdmin() return unless @isProduction and not me.isAdmin()

2
app/styles/play/modal/poll-modal.sass
View file

@ -50,7 +50,7 @@
width: 380px width: 380px
text-align: center text-align: center
color: rgb(254,188,68) color: rgb(254,188,68)
font-size: 32px font-size: 28px
text-shadow: black 2px 2px 0, black -2px -2px 0, black 2px -2px 0, black -2px 2px 0, black 2px 0px 0, black 0px -2px 0, black -2px 0px 0, black 0px 2px 0 text-shadow: black 2px 2px 0, black -2px -2px 0, black 2px -2px 0, black -2px 2px 0, black 2px 0px 0, black 0px -2px 0, black -2px 0px 0, black 0px 2px 0
//- Body //- Body

2
app/templates/play/modal/poll-modal.jade
View file

@ -1,8 +1,6 @@
extends /templates/core/modal-base extends /templates/core/modal-base
block modal-header-content block modal-header-content
h1 h1
span(data-i18n="play.poll") Poll
span.spr :
span= i18n(poll.attributes, "name") span= i18n(poll.attributes, "name")
block modal-body-content block modal-body-content

2
app/views/play/level/tome/SpellView.coffee
View file

@ -265,6 +265,7 @@ module.exports = class SpellView extends CocoView
if not lockDefaultCode or (_.isNumber(lockDefaultCode) and lockDefaultCode < me.level()) if not lockDefaultCode or (_.isNumber(lockDefaultCode) and lockDefaultCode < me.level())
return return
return unless @spell.source is @spell.originalSource or force return unless @spell.source is @spell.originalSource or force
return if @isIE() # Temporary workaround for #2512
console.info 'Locking down default code.' console.info 'Locking down default code.'
@ -800,6 +801,7 @@ module.exports = class SpellView extends CocoView
preload: -> preload: ->
# Send this code over to the God for preloading, but don't change the cast state. # Send this code over to the God for preloading, but don't change the cast state.
return if @spell.source.indexOf 'while' # If they're working with while-loops, it's more likely to be an incomplete infinite loop, so don't preload.
oldSource = @spell.source oldSource = @spell.source
oldSpellThangAethers = {} oldSpellThangAethers = {}
for thangID, spellThang of @spell.thangs for thangID, spellThang of @spell.thangs