diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-05-25 20:27:20 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-05-25 20:27:20 -0700 |
| commit | 710627fbd89560f40fb37e25f474859a3914a381 (patch) | |
| tree | 3e6c75696efa046552ac2f80fe15cbe4d3aeb117 | |
| parent | dfa1d96a1fa372b292c83424f62ae10d2c053fbd (diff) | |
| download | gitlab-ce-710627fbd89560f40fb37e25f474859a3914a381.tar.gz | |
Fix Zen Mode not closing with ESC key
Closes #1025
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/zen_mode.js.coffee | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index ed9ffefb67f..f8a748c9407 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.12.0 (unreleased) + - Fix Zen Mode not closing with ESC key (Stan Hu) - Add web hook support for note events (Stan Hu) - Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings (Stan Hu) - Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka) diff --git a/app/assets/javascripts/zen_mode.js.coffee b/app/assets/javascripts/zen_mode.js.coffee index 0fb8f7ed75f..e2516b4ae76 100644 --- a/app/assets/javascripts/zen_mode.js.coffee +++ b/app/assets/javascripts/zen_mode.js.coffee @@ -12,11 +12,11 @@ class @ZenMode $('body').on 'click', '.zen-enter-link', (e) => e.preventDefault() - $(e.currentTarget).closest('.zennable').find('.zen-toggle-comment').prop('checked', true) + $(e.currentTarget).closest('.zennable').find('.zen-toggle-comment').prop('checked', true).change() $('body').on 'click', '.zen-leave-link', (e) => e.preventDefault() - $(e.currentTarget).closest('.zennable').find('.zen-toggle-comment').prop('checked', false) + $(e.currentTarget).closest('.zennable').find('.zen-toggle-comment').prop('checked', false).change() $('body').on 'change', '.zen-toggle-comment', (e) => checkbox = e.currentTarget |