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

A few fixes for IE, anonymous errors, and cast button overflow.

Browse source
This commit is contained in:
Nick Winter 2014-02-23 11:23:26 -08:00
parent 5f4d5afe4f
commit 60eb0db1aa
4 changed files with 10 additions and 4 deletions
app
lib
AudioPlayer.coffeeTracker.coffee
styles/play/level/tome
cast_button.sass
views/play/level/tome
spell_view.coffee

2
app/lib/AudioPlayer.coffee
View file

@ -80,7 +80,7 @@ class AudioPlayer extends CocoClass
@soundsToPlayWhenLoaded[name] = volume @soundsToPlayWhenLoaded[name] = volume
playSound: (name, volume=1) -> playSound: (name, volume=1) ->
createjs.Sound.play name, {volume: me.get('volume') * volume} createjs.Sound.play name, {volume: (me.get('volume') ? 1) * volume}
# # TODO: load Interface sounds somehow, somewhere, somewhen # # TODO: load Interface sounds somehow, somewhere, somewhen

3
app/lib/Tracker.coffee
View file

@ -22,7 +22,7 @@ module.exports = class Tracker
return unless me and olark? return unless me and olark?
olark 'api.chat.updateVisitorStatus', snippet: ["User ID: #{me.id}"] olark 'api.chat.updateVisitorStatus', snippet: ["User ID: #{me.id}"]
return if me.get("anonymous") return if me.get("anonymous")
olark 'api.visitor.updateEmailAddress', emailAddress: me.get("email") olark 'api.visitor.updateEmailAddress', emailAddress: me.get("email") if me.get('email')
olark 'api.chat.updateVisitorNickname', snippet: me.displayName() olark 'api.chat.updateVisitorNickname', snippet: me.displayName()
updatePlayState: (level, session) -> updatePlayState: (level, session) ->
@ -33,7 +33,6 @@ module.exports = class Tracker
"User ID: #{me.id}" "User ID: #{me.id}"
"Session ID: #{session.id}" "Session ID: #{session.id}"
"Level: #{level.get('name')}" "Level: #{level.get('name')}"
] ]
olark 'api.chat.updateVisitorStatus', snippet: snippet olark 'api.chat.updateVisitorStatus', snippet: snippet

7
app/styles/play/level/tome/cast_button.sass
View file

@ -88,6 +88,13 @@
border-top-left-radius: 6px border-top-left-radius: 6px
border-bottom-left-radius: 6px border-bottom-left-radius: 6px
@media screen and (max-width: 1440px)
font-size: 16px
@media screen and (max-width: 1280px)
font-size: 14px
@media screen and (max-width: 1024px)
font-size: 12px
.cast-options-button .cast-options-button
width: 20% width: 20%
width: -webkit-calc(40px) width: -webkit-calc(40px)

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

@ -352,7 +352,7 @@ module.exports = class SpellView extends View
#@recompileValid = not aether.getAllProblems().length #@recompileValid = not aether.getAllProblems().length
valid = not aether.getAllProblems().length valid = not aether.getAllProblems().length
cursorPosition = @ace.getCursorPosition() cursorPosition = @ace.getCursorPosition()
currentLine = @aceDoc.$lines[cursorPosition.row].replace(/[ \t]*\/\/[^"']*/g, '').trimRight() # trim // unless inside " currentLine = _.string.rtrim(@aceDoc.$lines[cursorPosition.row].replace(/[ \t]*\/\/[^"']*/g, '')) # trim // unless inside "
endOfLine = cursorPosition.column >= currentLine.length # just typed a semicolon or brace, for example endOfLine = cursorPosition.column >= currentLine.length # just typed a semicolon or brace, for example
beginningOfLine = not currentLine.substr(0, cursorPosition.column).trim().length # uncommenting code, for example beginningOfLine = not currentLine.substr(0, cursorPosition.column).trim().length # uncommenting code, for example
#console.log "finished?", valid, endOfLine, beginningOfLine, cursorPosition, currentLine.length, aether, new Date() - 0, currentLine #console.log "finished?", valid, endOfLine, beginningOfLine, cursorPosition, currentLine.length, aether, new Date() - 0, currentLine