summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-25 20:51:08 -0700
committerStan Hu <stanhu@gmail.com>2015-05-25 21:03:55 -0700
commitae552ec3158c88b6eb6d61cd4281442eff8d63b4 (patch)
treebef0cee8202d8a26f6ea810fbe29624af937c785 /app/assets
parentdfa1d96a1fa372b292c83424f62ae10d2c053fbd (diff)
downloadgitlab-ce-ae552ec3158c88b6eb6d61cd4281442eff8d63b4.tar.gz
Fix Markdown preview not working in Edit Milestone page
Closes #1687 Closes https://github.com/gitlabhq/gitlabhq/issues/9325
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/zen_mode.js.coffee23
1 files changed, 2 insertions, 21 deletions
diff --git a/app/assets/javascripts/zen_mode.js.coffee b/app/assets/javascripts/zen_mode.js.coffee
index 0fb8f7ed75f..26efc374f7f 100644
--- a/app/assets/javascripts/zen_mode.js.coffee
+++ b/app/assets/javascripts/zen_mode.js.coffee
@@ -1,6 +1,4 @@
class @ZenMode
- @fullscreen_prefix = 'fullscreen_'
-
constructor: ->
@active_zen_area = null
@active_checkbox = null
@@ -23,7 +21,7 @@ class @ZenMode
if checkbox.checked
# Disable other keyboard shortcuts in ZEN mode
Mousetrap.pause()
- @udpateActiveZenArea(checkbox)
+ @updateActiveZenArea(checkbox)
else
@exitZenMode()
@@ -32,14 +30,11 @@ class @ZenMode
@exitZenMode()
e.preventDefault()
- $(window).on 'hashchange', @updateZenModeFromLocationHash
-
- udpateActiveZenArea: (checkbox) =>
+ updateActiveZenArea: (checkbox) =>
@active_checkbox = $(checkbox)
@active_checkbox.prop('checked', true)
@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
@@ -51,17 +46,3 @@ class @ZenMode
window.scrollTo(window.pageXOffset, @scroll_position)
# Enable dropzone when leaving ZEN mode
Dropzone.forElement('.div-dropzone').enable()
-
- checkboxFromLocationHash: (e) ->
- id = $.trim(window.location.hash.replace('#' + ZenMode.fullscreen_prefix, ''))
- if id
- return $('.zennable input[type=checkbox]#' + id)[0]
- else
- return null
-
- updateZenModeFromLocationHash: (e) =>
- checkbox = @checkboxFromLocationHash()
- if checkbox
- @udpateActiveZenArea(checkbox)
- else
- @exitZenMode()