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

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-11-14 18:25:16 -08:00
commit 6f7faced23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/styles/base.sass
View file

@ -365,3 +365,6 @@ html.no-borderimage
&.disabled, &:disabled
background-image: url(/images/common/button-background-disabled.png)
body > iframe[src^="https://apis.google.com"]
display: none

4
app/views/play/level/LevelPlaybackView.coffee
View file

@ -133,7 +133,7 @@ module.exports = class LevelPlaybackView extends CocoView
@lastLoadedFrameCount = loadedFrameCount
onDisableControls: (e) ->
if not e.controls or 'playback' in e.controls
if not e.controls or ('playback' in e.controls)
@disabled = true
$('button', @$el).addClass('disabled')
try
@ -146,7 +146,7 @@ module.exports = class LevelPlaybackView extends CocoView
onEnableControls: (e) ->
return if @realTime
if not e.controls or 'playback' in e.controls
if not e.controls or ('playback' in e.controls)
@disabled = false
$('button', @$el).removeClass('disabled')
try