Fix for LevelLoader, selection udpating, and non-documentation tome popovers.

This commit is contained in:
Nick Winter 2014-02-16 18:29:24 -08:00
parent 2c41d403bc
commit c19c8f3912
4 changed files with 15 additions and 10 deletions

View file

@ -101,7 +101,7 @@ module.exports = class LevelLoader extends CocoClass
@$el.html('<div class="alert">' + msg + '</div>')
onSupermodelLoadedOne: (e) ->
@notifyProgress()
@update()
# Things to do when either the Session or Supermodel load

View file

@ -129,7 +129,7 @@ module.exports = class CocoRouter extends Backbone.Router
view.render()
closeCurrentView: ->
window.currentModal?.hide()
window.currentModal?.hide?()
return unless window.currentView?
if window.currentView.cache
window.currentView.scrollY = window.scrollY

View file

@ -254,8 +254,10 @@ module.exports = class SpriteBoss extends CocoClass
updateSelection: ->
if @selectedSprite?.thang and (not @selectedSprite.thang.exists or not @world.getThangByID @selectedSprite.thang.id)
@selectSprite null, null, null
@selectionMark?.toggle false
@updateTarget()
return unless @selectionMark
@selectedSprite = null unless @selectedSprite?.thang
@selectionMark.toggle @selectedSprite?
@selectionMark.setSprite @selectedSprite
@selectionMark.update()

View file

@ -4,21 +4,24 @@
#tome-view
height: 100%
> .popover
// Only those popovers which are our direct children (spell documentation)
left: auto !important
top: auto !important
right: 100%
bottom: 151px
@include user-select(text)
&.pinned
@include box-shadow(0 0 500px white)
.popover
padding: 10px
min-width: 400px
background: transparent url(/images/level/popover_background.png)
background-size: 100% 100%
border: 0
left: auto !important
top: auto !important
right: 100%
bottom: 151px
@include box-shadow(0 0 0 #000)
@include user-select(text)
&.pinned
@include box-shadow(0 0 500px white)
h1:not(.not-code), h2:not(.not-code), h3:not(.not-code), h4:not(.not-code), h5:not(.not-code), h6:not(.not-code)
font-family: Menlo, Monaco, Consolas, "Courier New", monospace