summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-07-15 02:15:32 +0300
committerFatih Acet <acetfatih@gmail.com>2016-07-19 02:21:36 +0300
commit159135291af0066b6c1fdbae04e2f05a785986aa (patch)
tree01c3d89451ae66788ab283f226f8302c9073b95c
parentc7ffc71224dd8e1ce42372c9310bbcc937a00d2c (diff)
downloadgitlab-ce-159135291af0066b6c1fdbae04e2f05a785986aa.tar.gz
Fix inline view for comment button selector.
-rw-r--r--app/assets/javascripts/files_comment_button.js.coffee5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/files_comment_button.js.coffee b/app/assets/javascripts/files_comment_button.js.coffee
index 2b9dc6419d5..63d453fa411 100644
--- a/app/assets/javascripts/files_comment_button.js.coffee
+++ b/app/assets/javascripts/files_comment_button.js.coffee
@@ -63,7 +63,10 @@ class @FilesCommentButton
getLineContent: (hoveredElement) ->
return hoveredElement if hoveredElement.hasClass LINE_CONTENT_CLASS
- $(hoveredElement).next ".#{LINE_CONTENT_CLASS}"
+ if @VIEW_TYPE is 'inline'
+ return $(hoveredElement).closest(LINE_HOLDER_CLASS).find ".#{LINE_CONTENT_CLASS}"
+ else
+ return $(hoveredElement).next ".#{LINE_CONTENT_CLASS}"
getButtonParent: (hoveredElement) ->
if @VIEW_TYPE is 'inline'