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

Merge branch 'rs-issue-1568' into 'master'
7298d05c · Douwe Maan · 3a3f4b41 · cbcc5f85 · 7298d05c · 7298d05c
Commit 7298d05c authored May 21, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

notes.js.coffee app/assets/javascripts/notes.js.coffee +8 -0

No files found.
--- 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)

--- 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")
  ###