summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-09-20 18:17:19 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2014-09-20 18:17:19 +0200
commitfda61a047ffb9b04bc4dd38e897088fde17fb3c1 (patch)
tree1281c5d1bca3e7d269ec6d757de77879ce4dddfa
parent8fd0d74bd84a8424e8c2f5e131efdb737f21a1f9 (diff)
parentd5badd7ef661e9e896fe272614eca4171ed76cf4 (diff)
downloadgitlab-ce-fda61a047ffb9b04bc4dd38e897088fde17fb3c1.tar.gz
Merge pull request #7805 from Razer6/improve/zen
Prevent default action when closing zen mode
-rw-r--r--app/assets/javascripts/zen_mode.js.coffee1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/zen_mode.js.coffee b/app/assets/javascripts/zen_mode.js.coffee
index 6c220650998..d28b635355e 100644
--- a/app/assets/javascripts/zen_mode.js.coffee
+++ b/app/assets/javascripts/zen_mode.js.coffee
@@ -16,6 +16,7 @@ class @ZenMode
$(document).on 'keydown', (e) =>
if e.keyCode is $.ui.keyCode.ESCAPE
@exitZenMode()
+ e.preventDefault()
$(window).on 'hashchange', @updateZenModeFromLocationHash