codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-26 00:58:00 -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-03-29 14:06:30 -07:00
commit b84b86c6b5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/kinds/SearchView.coffee
View file

@ -5,7 +5,7 @@ app = require('application')
class SearchCollection extends Backbone.Collection
initialize: (modelURL, @model, @term) ->
@url = "#{modelURL}/search?project=yes"
@url = "#{modelURL}/search?project=true"
@url += "&term=#{term}" if @term
module.exports = class ThangTypeHomeView extends View
@ -110,7 +110,7 @@ module.exports = class ThangTypeHomeView extends View
that = @
res.success ->
that.model = model
modal.modal('hide')
modal.modal('hide')
onModalHidden: ->
# Can only redirect after the modal hidden event has triggered

3
app/views/play/level/tome/problem_alert_view.coffee
View file

@ -24,7 +24,8 @@ module.exports = class ProblemAlertView extends View
afterRender: ->
super()
@$el.addClass('alert').addClass("alert-#{@problem.aetherProblem.level}")
@$el.addClass('alert').addClass("alert-#{@problem.aetherProblem.level}").hide().fadeIn('slow')
Backbone.Mediator.publish 'play-sound', trigger: 'error_appear', volume: 1.0
onRemoveClicked: ->
@$el.remove()