kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

review changes

Browse source
This commit is contained in:
Luke "Jared" Bennett 2016-07-06 20:33:28 +01:00
parent c6abeffea1
commit 5ab95ba69a
No known key found for this signature in database
GPG key ID: 7EC4B269DC10037C
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/files_comment_button.js.coffee
View file

@ -1,10 +1,10 @@
class @FilesCommentButton
constructor: (@filesContainerElement) ->
return if not @filesContainerElement
return if not @filesContainerElement.data 'can-create-note'
return unless @filesContainerElement
return if _.isUndefined @filesContainerElement.data 'can-create-note'
@COMMENT_BUTTON_CLASS = '.add-diff-note'
@COMMENT_BUTTON_TEMPLATE = _.template("<button name='button' type='submit' class='btn <%- COMMENT_BUTTON_CLASS %> js-add-diff-note-button' title='Add a comment to this line'><i class='fa fa-comment-o'></i></button>")
@COMMENT_BUTTON_TEMPLATE = _.template '<button name="button" type="submit" class="btn <%- COMMENT_BUTTON_CLASS %> js-add-diff-note-button" title="Add a comment to this line"><i class="fa fa-comment-o"></i></button>'
@LINE_HOLDER_CLASS = '.line_holder'
@LINE_NUMBER_CLASS = 'diff-line-num'
@ -37,7 +37,7 @@ class @FilesCommentButton
lineContentElement = @getLineContent(currentTarget)
buttonParentElement = @getButtonParent(currentTarget)
return if not @shouldRender e, buttonParentElement
return unless @shouldRender e, buttonParentElement
buttonParentElement.append @buildButton
id:
@ -58,7 +58,9 @@ class @FilesCommentButton
return
buildButton: (buttonAttributes) ->
$(@COMMENT_BUTTON_TEMPLATE COMMENT_BUTTON_CLASS: @COMMENT_BUTTON_CLASS.substr 1).attr
initializedButtonTemplate = @COMMENT_BUTTON_TEMPLATE
COMMENT_BUTTON_CLASS: @COMMENT_BUTTON_CLASS.substr 1
$(initializedButtonTemplate).attr
'data-noteable-id': buttonAttributes.id.noteable
'data-commit-id': buttonAttributes.id.commit
'data-discussion-id': buttonAttributes.id.discussion

2
app/views/projects/diffs/_diffs.html.haml
View file

@ -21,7 +21,7 @@
- if diff_files.overflow?
= render 'projects/diffs/warning', diff_files: diff_files
.files{data: {can_create_note: (!@diff_notes_disabled && can?(current_user, :create_note, @project)).to_s}}
.files{data: {can_create_note: (!@diff_notes_disabled && can?(current_user, :create_note, @project))}}
- diff_files.each_with_index do |diff_file, index|
- diff_commit = commit_for_diff(diff_file)
- blob = project.repository.blob_for_diff(diff_commit, diff_file)