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

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
George Saines 2014-10-30 19:11:16 -07:00
commit a1695993db
3 changed files with 10 additions and 1 deletions
app
styles/play/level
hud.sass
views/play/level
LevelGoalsView.coffeeLevelHUDView.coffee

4
app/styles/play/level/hud.sass
View file

@ -48,6 +48,10 @@
background-image: url(/images/level/hud_right_wing.png) background-image: url(/images/level/hud_right_wing.png)
background-position: left background-position: left
&.hide-hud-properties .center .thang-props
visibility: hidden
position: absolute
.center .center
width: 560px width: 560px
height: 120px height: 120px

3
app/views/play/level/LevelGoalsView.coffee
View file

@ -60,7 +60,8 @@ module.exports = class LevelGoalsView extends CocoView
# This should really get refactored, along with GoalManager, so that goals have a standard # This should really get refactored, along with GoalManager, so that goals have a standard
# representation of how many are done, how many are needed, what that means, etc. # representation of how many are done, how many are needed, what that means, etc.
li = $('<li></li>').addClass("status-#{state.status}").text(text) li = $('<li></li>').addClass("status-#{state.status}").text(text)
li.prepend($('<i></i>').addClass('glyphicon').addClass(iconClass) if iconClass = stateIconMap[state.status]) iconClass = stateIconMap[state.status]
li.prepend($('<i></i>').addClass("glyphicon #{iconClass or ''}")) # If empty, insert a .glyphicon to take up space
list.append(li) list.append(li)
goals.push goal goals.push goal
if not firstRun and state.status is 'success' and @previousGoalStatus[goal.id] isnt 'success' if not firstRun and state.status is 'success' and @previousGoalStatus[goal.id] isnt 'success'

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

@ -30,6 +30,9 @@ module.exports = class LevelHUDView extends CocoView
afterRender: -> afterRender: ->
super() super()
@$el.addClass 'no-selection' @$el.addClass 'no-selection'
if @options.level.get('slug') in ['dungeons-of-kithgard', 'gems-in-the-deep', 'forgetful-gemsmith', 'shadow-guard', 'kounter-kithwise', 'crawlways-of-kithgard', 'true-names', 'favorable-odds', 'the-raised-sword', 'the-first-kithmaze', 'descending-further', 'the-second-kithmaze', 'new-sight', 'known-enemy', 'master-of-names', 'lowly-kithmen', 'closing-the-distance', 'assassinating-more-kithmen???', 'the-final-kithmaze', 'the-gauntlet']
@hidesHUD = true
@$el.addClass 'hide-hud-properties'
onClick: (e) -> onClick: (e) ->
Backbone.Mediator.publish 'tome:focus-editor', {} unless $(e.target).parents('.thang-props').length Backbone.Mediator.publish 'tome:focus-editor', {} unless $(e.target).parents('.thang-props').length
@ -264,6 +267,7 @@ module.exports = class LevelHUDView extends CocoView
$('.thang-elem', @$el).removeClass('secret') $('.thang-elem', @$el).removeClass('secret')
$('.dialogue-area', @$el).addClass('secret') $('.dialogue-area', @$el).addClass('secret')
$('.thang-actions', @$el).toggleClass 'secret', not @showingActions $('.thang-actions', @$el).toggleClass 'secret', not @showingActions
@$el.find('.thang-canvas-wrapper').addClass('secret') if @hidesHUD
update: -> update: ->
return unless @thang and not @speaker return unless @thang and not @speaker