Refactor merge request widget step 2

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 4 insertions, 23 deletions

diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index b8f916b5223..5e440f3b1d1 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -27,14 +27,11 @@ class @MergeRequest
     this.bindEvents()
     this.activateTabFromPath()
 
-    this.initMergeWidget()
     this.$('.show-all-commits').on 'click', =>
       this.showAllCommits()
 
     modal = $('#modal_merge_info').modal(show: false)
 
-    disableButtonIfEmptyField '#commit_message', '.accept_merge_request'
-
     # Prevent duplicate event bindings
     @disableTaskList()
 
@@ -63,14 +60,11 @@ class @MergeRequest
     $(".context .inline-update").on "change", "#merge_request_assignee_id", ->
       $(this).submit()
 
-  initMergeWidget: ->
-    this.showState( @opts.current_status )
-
-    if this.$('.automerge_widget').length and @opts.check_enable
-      $.get @opts.url_to_automerge_check, (data) =>
-        this.showState( data.merge_status )
-      , 'json'
+  getMergeStatus: ->
+    $.get @opts.url_to_automerge_check, (data) ->
+      $('.mr-state-widget').replaceWith(data)
 
+  getCiStatus: ->
     if @opts.ci_enable
       $.get @opts.url_to_ci_check, (data) =>
         this.showCiState data.status
@@ -92,10 +86,6 @@ class @MergeRequest
       unless @opts.action == 'new'
         @setCurrentAction(tab_action)
 
-    this.$('.accept_merge_request').on 'click', ->
-      $('.automerge_widget.can_be_merged').hide()
-      $('.merge-in-progress').show()
-
     this.$('.remove_source_branch').on 'click', ->
       $('.remove_source_branch_widget').hide()
       $('.remove_source_branch_in_progress').show()
@@ -157,10 +147,6 @@ class @MergeRequest
     # See https://github.com/rails/turbolinks/issues/363
     history.replaceState {turbolinks: true, url: new_state}, '', new_state
 
-  showState: (state) ->
-    $('.automerge_widget').hide()
-    $('.automerge_widget.' + state).show()
-
   showCiState: (state) ->
     $('.ci_widget').hide()
     allowed_states = ["failed", "canceled", "running", "pending", "success"]
@@ -198,11 +184,6 @@ class @MergeRequest
     this.$('.first-commits').remove()
     this.$('.all-commits').removeClass 'hide'
 
-  alreadyOrCannotBeMerged: ->
-    this.$('.automerge_widget').hide()
-    this.$('.merge-in-progress').hide()
-    this.$('.automerge_widget.already_cannot_be_merged').show()
-
   setMergeButtonClass: (css_class) ->
     $('.accept_merge_request').removeClass("btn-create").addClass(css_class)