diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-07 09:20:00 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-07 09:20:00 +0000 |
| commit | b9df4998607c64b758af641339edd40254900ecc (patch) | |
| tree | a2e5572f4c8aa8c42694d57ae5747c33a36ea551 | |
| parent | af35fc8c25789eacabb11ddc1fc8685e9279fdf4 (diff) | |
| parent | 38f1d571fe17725d437dae2f6c4f18006117ef9d (diff) | |
| download | gitlab-ce-b9df4998607c64b758af641339edd40254900ecc.tar.gz | |
Merge branch 'rs-dev-issue-2466' into 'master'
Remove style attribute from textarea during ZenMode activation
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
Closes https://github.com/gitlabhq/gitlabhq/issues/8963
See merge request !1248
| -rw-r--r-- | app/assets/javascripts/zen_mode.js.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/zen_mode_spec.js.coffee | 5 |
2 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 8a0564a9098..a1462cf3cae 100644 --- a/app/assets/javascripts/zen_mode.js.coffee +++ b/app/assets/javascripts/zen_mode.js.coffee @@ -38,6 +38,8 @@ class @ZenMode @active_checkbox = $(checkbox) @active_checkbox.prop('checked', true) @active_zen_area = @active_checkbox.parent().find('textarea') + # Prevent a user-resized textarea from persisting to fullscreen + @active_zen_area.removeAttr('style') @active_zen_area.focus() exitZenMode: => diff --git a/spec/javascripts/zen_mode_spec.js.coffee b/spec/javascripts/zen_mode_spec.js.coffee index 1f4ea58ad48..4cb3836755f 100644 --- a/spec/javascripts/zen_mode_spec.js.coffee +++ b/spec/javascripts/zen_mode_spec.js.coffee @@ -29,6 +29,11 @@ describe 'ZenMode', -> enterZen() expect(Mousetrap.pause).toHaveBeenCalled() + it 'removes textarea styling', -> + $('textarea').attr('style', 'height: 400px') + enterZen() + expect('textarea').not.toHaveAttr('style') + describe 'in use', -> beforeEach -> enterZen() |