Extract merge request widget JS to separate class

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

8 files changed, 38 insertions, 17 deletions

diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 02a9a53d9c8..5d7e73f2b28 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -69,10 +69,5 @@
   var merge_request;
 
   merge_request = new MergeRequest({
-    url_to_automerge_check: "#{automerge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
-    check_enable: #{@merge_request.unchecked? ? "true" : "false"},
-    url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
-    ci_enable: #{@project.ci_service ? "true" : "false"},
-    current_status: "#{@merge_request.automerge_status}",
     action: "#{controller.action_name}"
   });
diff --git a/app/views/projects/merge_requests/automerge.js.haml b/app/views/projects/merge_requests/automerge.js.haml
index 26db408a576..33321651e32 100644
--- a/app/views/projects/merge_requests/automerge.js.haml
+++ b/app/views/projects/merge_requests/automerge.js.haml
@@ -1,6 +1,6 @@
 - if @status
   :plain
-    merge_request.getMergeStatus();
+    merge_request_widget.mergeInProgress();
 - else
   :plain
     $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}");
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 0cbd88157ca..107c61477e3 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -35,4 +35,4 @@
 
   :coffeescript
     $ ->
-      merge_request.getCiStatus()
+      merge_request_widget.getCiStatus()
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml
index 7fdeb3a96a3..17c3fdacda8 100644
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
@@ -24,3 +24,18 @@
           %i.fa.fa-spinner.fa-spin
            
           Removing source branch '#{@merge_request.source_branch}'. Please wait. Page will be automatically reloaded.  
+
+        :coffeescript
+          $('.remove_source_branch').on 'click', ->
+            $('.remove_source_branch_widget').hide()
+            $('.remove_source_branch_in_progress').show()
+
+          $(".remove_source_branch").on "ajax:success", (e, data, status, xhr) ->
+            location.reload()
+
+          $(".remove_source_branch").on "ajax:error", (e, data, status, xhr) ->
+            $('.remove_source_branch_widget').hide()
+            $('.remove_source_branch_in_progress').hide()
+            $('.remove_source_branch_widget.failed').show()
+
+
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index da936a54aa6..263cab7a9e8 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -6,3 +6,15 @@
   = render 'projects/merge_requests/widget/closed'
 - elsif @merge_request.locked?
   = render 'projects/merge_requests/widget/locked'
+
+:javascript
+  var merge_request_widget;
+
+  merge_request_widget = new MergeRequestWidget({
+    url_to_automerge_check: "#{automerge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
+    check_enable: #{@merge_request.unchecked? ? "true" : "false"},
+    url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
+    ci_enable: #{@project.ci_service ? "true" : "false"},
+    current_status: "#{@merge_request.automerge_status}",
+  });
+
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index b2ea57126ee..41aa66dd76b 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -1,8 +1,9 @@
-= form_for [:automerge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post do |f|
+= form_for [:automerge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form' } do |f|
   = hidden_field_tag :authenticity_token, form_authenticity_token
   .accept-merge-holder.clearfix.js-toggle-container
     .accept-action
-      = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
+      = f.button class: "btn btn-create accept_merge_request" do
+        Accept Merge Request
     - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
       .accept-control.checkbox
         = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
@@ -26,5 +27,8 @@
   :coffeescript
     disableButtonIfEmptyField '#commit_message', '.accept_merge_request'
 
-    $('.accept_merge_request').on 'click', ->
-      $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/mip'))}")
+    $('.accept-mr-form').on 'ajax:before', ->
+      btn = $('.accept_merge_request')
+      btn.disable()
+      btn.html("<i class='fa fa-spinner fa-spin'></i> Merge in progress")
+
diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml
index 0ca54f3941e..5ca2d37a979 100644
--- a/app/views/projects/merge_requests/widget/open/_check.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_check.html.haml
@@ -5,4 +5,4 @@
 
 :coffeescript
   $ ->
-    merge_request.getMergeStatus()
+    merge_request_widget.getMergeStatus()
diff --git a/app/views/projects/merge_requests/widget/open/_mip.html.haml b/app/views/projects/merge_requests/widget/open/_mip.html.haml
deleted file mode 100644
index d86aaff3507..00000000000
--- a/app/views/projects/merge_requests/widget/open/_mip.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-.merge-in-progress
-  %p
-    %i.fa.fa-spinner.fa-spin
-    &nbsp;
-    Merge is in progress. Please wait… Page will be reloaded automatically. &nbsp;