diff --git a/app/assets/images/common/code_languages/io_icon.png b/app/assets/images/common/code_languages/io_icon.png old mode 100644 new mode 100755 index 0b6c58fe4..14f04afc3 Binary files a/app/assets/images/common/code_languages/io_icon.png and b/app/assets/images/common/code_languages/io_icon.png differ diff --git a/app/assets/images/common/code_languages/javascript_icon.png b/app/assets/images/common/code_languages/javascript_icon.png old mode 100644 new mode 100755 index 4580f350b..085dbe523 Binary files a/app/assets/images/common/code_languages/javascript_icon.png and b/app/assets/images/common/code_languages/javascript_icon.png differ diff --git a/app/views/play/level/tome/SpellListTabEntryView.coffee b/app/views/play/level/tome/SpellListTabEntryView.coffee index ccd5f6716..04584af67 100644 --- a/app/views/play/level/tome/SpellListTabEntryView.coffee +++ b/app/views/play/level/tome/SpellListTabEntryView.coffee @@ -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' diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee index 585d184f1..f1c21daa5 100644 --- a/app/views/play/level/tome/SpellView.coffee +++ b/app/views/play/level/tome/SpellView.coffee @@ -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 diff --git a/bower.json b/bower.json index e979e2f49..87630ea99 100644 --- a/bower.json +++ b/bower.json @@ -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": {