diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-19 20:18:13 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-19 20:18:13 +0200 |
| commit | 9c08ce63dd8dfe2fd2fab37e4e5493a95120f385 (patch) | |
| tree | 4ff97c9a2934bae26db68b64cfed3d72b5f58948 | |
| parent | c759b8c99e49841767269362257be146744f636e (diff) | |
| parent | 04ef3ddc6c3e6b8199a73ff390116e707bd5f33e (diff) | |
| download | gitlab-ce-9c08ce63dd8dfe2fd2fab37e4e5493a95120f385.tar.gz | |
Merge pull request #7797 from cirosantilli/zen-style
Improve zen mode internals.
| -rw-r--r-- | app/assets/javascripts/zen_mode.js.coffee | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/zen_mode.js.coffee b/app/assets/javascripts/zen_mode.js.coffee index aea707d8550..6c220650998 100644 --- a/app/assets/javascripts/zen_mode.js.coffee +++ b/app/assets/javascripts/zen_mode.js.coffee @@ -1,13 +1,12 @@ class @ZenMode @fullscreen_prefix = 'fullscreen_' - @ESC = 27 constructor: -> @active_zen_area = null @active_checkbox = null $('body').on 'change', '.zennable input[type=checkbox]', (e) => - checkbox = e.currentTarget; + checkbox = e.currentTarget if checkbox.checked Mousetrap.pause() @udpateActiveZenArea(checkbox) @@ -15,8 +14,7 @@ class @ZenMode @exitZenMode() $(document).on 'keydown', (e) => - console.log("esc") - if e.keyCode is ZenMode.ESC + if e.keyCode is $.ui.keyCode.ESCAPE @exitZenMode() $(window).on 'hashchange', @updateZenModeFromLocationHash @@ -27,7 +25,7 @@ class @ZenMode @active_zen_area = @active_checkbox.parent().find('textarea') @active_zen_area.focus() window.location.hash = ZenMode.fullscreen_prefix + @active_checkbox.prop('id') - + exitZenMode: => if @active_zen_area isnt null Mousetrap.unpause() @@ -48,4 +46,4 @@ class @ZenMode if checkbox @udpateActiveZenArea(checkbox) else - @exitZenMode() + @exitZenMode() |