diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-09-22 09:59:23 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-09-22 09:59:23 +0200 |
| commit | b43e918a73c88a8d922c5c5d79e2aa2bf42a9d29 (patch) | |
| tree | 818bd525906b118f58b262ed0ba3418866a91c3c | |
| parent | 560c41ccf2cc4b1fef53744770392ea7f248a528 (diff) | |
| parent | 28ba985ef936bfffcb83025b2a093e048c761938 (diff) | |
| download | gitlab-ce-b43e918a73c88a8d922c5c5d79e2aa2bf42a9d29.tar.gz | |
Merge pull request #7815 from Razer6/zen/fix_scroll_position
Save last scrollposition and scroll back when leaving ZEN mode
| -rw-r--r-- | app/assets/javascripts/zen_mode.js.coffee | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/zen_mode.js.coffee b/app/assets/javascripts/zen_mode.js.coffee index d28b635355e..21ac212df0e 100644 --- a/app/assets/javascripts/zen_mode.js.coffee +++ b/app/assets/javascripts/zen_mode.js.coffee @@ -4,10 +4,16 @@ class @ZenMode constructor: -> @active_zen_area = null @active_checkbox = null + @scroll_position = 0 + + $(window).scroll => + if not @active_checkbox + @scroll_position = window.pageYOffset $('body').on 'change', '.zennable input[type=checkbox]', (e) => checkbox = e.currentTarget if checkbox.checked + # Disable other keyboard shortcuts in ZEN mode Mousetrap.pause() @udpateActiveZenArea(checkbox) else @@ -34,6 +40,7 @@ class @ZenMode @active_zen_area = null @active_checkbox = null window.location.hash = '' + window.scrollTo(window.pageXOffset, @scroll_position) checkboxFromLocationHash: (e) -> id = $.trim(window.location.hash.replace('#' + ZenMode.fullscreen_prefix, '')) |