diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-26 17:26:28 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-26 17:26:28 +0000 |
| commit | 5c2acc51e24db47aa4d4efbeba792c3b90d9b923 (patch) | |
| tree | a0613e1f0c2964af9c030dc491e6e2bbe97e4a58 | |
| parent | f815094e6ddfb6760d1af37b3b2bc19f6e37baf0 (diff) | |
| parent | 710627fbd89560f40fb37e25f474859a3914a381 (diff) | |
| download | gitlab-ce-5c2acc51e24db47aa4d4efbeba792c3b90d9b923.tar.gz | |
Merge branch 'fix-escape-key-in-zen-mode' into 'master'
Fix Zen Mode not closing with ESC key
### What does this MR do?
This MR fixes the ESC key not leaving Zen Mode (fullscreen).
### Why was this MR needed?
This has been broken since GitLab v7.8. The `change` event for `zen-toggle-comment` was never fired. See:
http://stackoverflow.com/questions/19505011/checkbox-checked-with-prop-does-not-fire-events-attached-to-change?answertab=votes#tab-top
### What are the relevant issue numbers?
* Closes #1025
* Closes https://github.com/gitlabhq/gitlabhq/issues/9018
See merge request !710
| -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 5a5238ffa5b..466483e7c89 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.12.0 (unreleased) - Refactor permission checks with issues and merge requests project settings (Stan Hu) - Fix Markdown preview not working in Edit Milestone page (Stan Hu) + - 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) - Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu) diff --git a/app/assets/javascripts/zen_mode.js.coffee b/app/assets/javascripts/zen_mode.js.coffee index 26efc374f7f..dc6a84c6c52 100644 --- a/app/assets/javascripts/zen_mode.js.coffee +++ b/app/assets/javascripts/zen_mode.js.coffee @@ -10,11 +10,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 |