diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-21 09:31:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-21 09:31:59 +0000 |
| commit | 7298d05cc08b2cc2dc6453fc45d59d07de042869 (patch) | |
| tree | 7e3e337258ea9282388a1ac899ad023684092330 | |
| parent | 3a3f4b41e67485e62b2e37cc395f3407b30a7d9e (diff) | |
| parent | cbcc5f854400f8e22c2164d6265fb863279c9622 (diff) | |
| download | gitlab-ce-7298d05cc08b2cc2dc6453fc45d59d07de042869.tar.gz | |
Merge branch 'rs-issue-1568' into 'master'
Work around a Chrome 43 bug preventing note editing
Fixes #1568 - and I mean "fixes"
I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11.
See merge request !684
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3829cdb5237..d8474968179 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 7.12.0 (unreleased) v 7.11.0 (unreleased) - Fall back to Plaintext when Syntaxhighlighting doesn't work. Fixes some buggy lexers (Hannes Rosenögger) + - Get editing comments to work in Chrome 43 again. - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu) - Don't show duplicate deploy keys - Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger) diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index c25b1ddb066..f186fec2a0c 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -312,6 +312,14 @@ class @Notes form.show() textarea = form.find("textarea") textarea.focus() + + # HACK (rspeicher/DouweM): Work around a Chrome 43 bug(?). + # The textarea has the correct value, Chrome just won't show it unless we + # modify it, so let's clear it and re-set it! + value = textarea.val() + textarea.val "" + textarea.val value + disableButtonIfEmptyField textarea, form.find(".js-comment-button") ### |