codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 23:58:02 -05: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:
Scott Erickson 2014-07-23 07:09:12 -07:00
commit beef508e76
5 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/common/code_languages/io_icon.png Normal file → Executable file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/assets/images/common/code_languages/javascript_icon.png Normal file → Executable file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

1
app/views/play/level/tome/SpellListTabEntryView.coffee
View file

@ -13,6 +13,7 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
'tome:spell-changed': 'onSpellChanged'
'god:new-world-created': 'onNewWorld'
'tome:spell-changed-language': 'onSpellChangedLanguage'
'tome:fullscreen-view': 'onFullscreenClick'
events:
'click .spell-list-button': 'onDropdownClick'

4
app/views/play/level/tome/SpellView.coffee
View file

@ -167,6 +167,10 @@ module.exports = class SpellView extends CocoView
bindKey: {win: 'Ctrl-L', mac: 'Command-L'}
passEvent: true
exec: -> # just prevent default ACE go-to-line alert
addCommand
name: 'open-fullscreen-editor'
bindKey: {win: 'Alt-Shift-F', mac: 'Ctrl-Shift-F'}
exec: -> Backbone.Mediator.publish 'tome:fullscreen-view'
fillACE: ->
@ace.setValue @spell.source

2
bower.json
View file

@ -44,7 +44,7 @@
"bootstrap": "~3.1.1",
"validated-backbone-mediator": "~0.1.3",
"jquery.browser": "~0.0.6",
"zatanna": "~0.0.2",
"zatanna": "~0.0.3",
"modernizr": "~2.8.3"
},
"overrides": {