summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/javascripts/notes.js.coffee8
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")
###