mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-28 18:15:52 -05:00
Merge branch 'master' into production
This commit is contained in:
commit
80adc28947
4 changed files with 7 additions and 1 deletions
Binary file not shown.
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 16 KiB |
|
@ -291,3 +291,6 @@ $gameControlMargin: 30px
|
|||
body:not(.ipad) #world-map-view
|
||||
.level-info-container
|
||||
pointer-events: none
|
||||
|
||||
.old-levels
|
||||
display: none
|
||||
|
|
|
@ -225,7 +225,9 @@ module.exports = class SpellPaletteView extends CocoView
|
|||
@entryGroups = _.groupBy @entries, (entry) -> itemsByProp[entry.doc.name]?.get('name') ? 'Hero'
|
||||
iOSEntryGroups = {}
|
||||
for group, entries of @entryGroups
|
||||
iOSEntryGroups[group] = (entry.doc for entry in entries)
|
||||
iOSEntryGroups[group] =
|
||||
item: {name: group, imageURL: itemThangTypes[group]?.getPortraitURL()}
|
||||
props: (entry.doc for entry in entries)
|
||||
Backbone.Mediator.publish 'tome:palette-updated', thangID: @thang.id, entryGroups: JSON.stringify(iOSEntryGroups)
|
||||
|
||||
addEntry: (doc, shortenize, tabbify, isSnippet=false, item=null, showImage=false) ->
|
||||
|
|
|
@ -375,6 +375,7 @@ module.exports = class SpellView extends CocoView
|
|||
reloadCode: (cast=true) ->
|
||||
@updateACEText @spell.originalSource
|
||||
@recompile cast
|
||||
Backbone.Mediator.publish 'tome:spell-loaded', spell: @spell
|
||||
|
||||
recompileIfNeeded: =>
|
||||
@recompile() if @recompileNeeded
|
||||
|
|
Loading…
Reference in a new issue