summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-01-12 13:58:10 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-01-12 13:58:10 -0500
commitfa8b228f9dc391367e9cde8e90bff83dc6396434 (patch)
treecfd4ea0e17d752a2a46b54f6faaea5e192bd05a5
parent906de20f82f43dd81a82f56a689b1973a0c23080 (diff)
downloadgitlab-ce-fa8b228f9dc391367e9cde8e90bff83dc6396434.tar.gz
restores merge request coffee file
-rw-r--r--app/assets/javascripts/merge_request.js.coffee49
1 files changed, 0 insertions, 49 deletions
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index c6c7f37707f..9047587db81 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -22,7 +22,6 @@ class @MergeRequest
if $("a.btn-close").length
@initTaskList()
- @initMergeRequestBtnEventListeners()
# Local jQuery finder
$: (selector) ->
@@ -36,54 +35,6 @@ class @MergeRequest
# Show the first tab (Commits)
$('.merge-request-tabs a[data-toggle="tab"]:first').tab('show')
- initMergeRequestBtnEventListeners: ->
- _this = @
- mergeRequestFailMessage = 'Unable to update this merge request at this time.'
- $('a.btn-close, a.btn-reopen').on 'click', (e) ->
- e.preventDefault()
- e.stopImmediatePropagation()
- $this = $(this)
- isClose = $this.hasClass('btn-close')
- shouldSubmit = $this.hasClass('btn-comment')
- if shouldSubmit
- _this.submitNoteForm($this.closest('form'))
- $this.prop('disabled', true)
- url = $this.attr('href')
- $.ajax
- type: 'PUT',
- url: url,
- error: (jqXHR, textStatus, errorThrown) ->
- mergeRequestStatus = if isClose then 'close' else 'open'
- new Flash(mergeRequestFailMessage, 'alert')
- success: (data, textStatus, jqXHR) ->
- if data.saved
- if isClose
- $('a.btn-close').addClass('hidden')
- $('a.issuable-edit').addClass('hidden')
- $('a.btn-reopen').removeClass('hidden')
- $('div.status-box-closed').removeClass('hidden')
- $('div.status-box-open').addClass('hidden')
-
- $('div.mr-state-widget-closed').removeClass('hidden')
- $('div.mr-state-widget-opened').addClass('hidden')
- else
- $('a.btn-reopen').addClass('hidden')
- $('a.issuable-edit').removeClass('hidden')
- $('a.btn-close').removeClass('hidden')
- $('div.status-box-closed').addClass('hidden')
- $('div.status-box-open').removeClass('hidden')
-
- $('div.mr-state-widget-closed').addClass('hidden')
- $('div.mr-state-widget-opened').removeClass('hidden')
- else
- new Flash(mergeRequestFailMessage, 'alert')
- $this.prop('disabled', false)
-
- submitNoteForm: (form) =>
- noteText = form.find("textarea.js-note-text").val()
- if noteText.trim().length > 0
- form.submit()
-
showAllCommits: ->
this.$('.first-commits').remove()
this.$('.all-commits').removeClass 'hide'