From 6a7b673035752890023e630755f27ec0d412a129 Mon Sep 17 00:00:00 2001
From: Luke Bennett <lukeeeebennettplus@gmail.com>
Date: Thu, 6 Oct 2016 18:00:06 +0100
Subject: JS review changes - Removed window from window.gl in dispatcher

Added page:load event as ready isnt fired by turbolinks

Fix dropdown menu link click registration
---
 app/assets/javascripts/dispatcher.js                       | 2 +-
 app/assets/javascripts/pipeline.js.es6                     | 1 +
 app/assets/stylesheets/pages/pipelines.scss                | 4 ++++
 app/views/projects/commit/_pipeline_stage.html.haml        | 2 +-
 app/views/projects/commit/_pipeline_status_group.html.haml | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 45494afe7aa..adff73af79c 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -127,7 +127,7 @@
           }
           break;
         case 'projects:pipelines:show':
-          new window.gl.Pipelines();
+          new gl.Pipelines();
           break;
         case 'groups:activity':
           new Activities();
diff --git a/app/assets/javascripts/pipeline.js.es6 b/app/assets/javascripts/pipeline.js.es6
index 68a34dda2af..1030447f74a 100644
--- a/app/assets/javascripts/pipeline.js.es6
+++ b/app/assets/javascripts/pipeline.js.es6
@@ -4,6 +4,7 @@
     constructor() {
       $(document).off('click', '.toggle-pipeline-btn').on('click', '.toggle-pipeline-btn', this.toggleGraph);
       $(document).off('ready.addMarginToBuildColumns').on('ready.addMarginToBuildColumns', this.addMarginToBuildColumns);
+      $(document).off('page:load.addMarginToBuildColumns').on('page:load.addMarginToBuildColumns', this.addMarginToBuildColumns);
     }
 
     toggleGraph() {
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 9ce5bee466f..0c3c1e404af 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -373,6 +373,9 @@
     }
 
     .build-content {
+      display: -ms-flexbox;
+      display: -webkit-flex;
+      display: flex;
       width: 164px;
 
       .ci-status-icon {
@@ -403,6 +406,7 @@
         width: auto;
         padding: 0;
         color: $gl-text-color-light;
+        flex-grow: 1;
 
         .ci-status-text {
           max-width: 112px;
diff --git a/app/views/projects/commit/_pipeline_stage.html.haml b/app/views/projects/commit/_pipeline_stage.html.haml
index 68d42126bf6..289aa5178b1 100644
--- a/app/views/projects/commit/_pipeline_stage.html.haml
+++ b/app/views/projects/commit/_pipeline_stage.html.haml
@@ -10,5 +10,5 @@
   - else
     %li.build
       .curve
-      .dropdown.inline.build-content{ type: 'button', data: { toggle: 'dropdown' } }
+      .dropdown.inline.build-content
         = render "projects/commit/pipeline_status_group", name: group_name, subject: grouped_statuses
diff --git a/app/views/projects/commit/_pipeline_status_group.html.haml b/app/views/projects/commit/_pipeline_status_group.html.haml
index b26de822450..8582e9a8772 100644
--- a/app/views/projects/commit/_pipeline_status_group.html.haml
+++ b/app/views/projects/commit/_pipeline_status_group.html.haml
@@ -1,7 +1,7 @@
 - group_status = CommitStatus.where(id: subject).status
 %span.ci-status-icon
   = render_status_with_link('build', group_status)
-%button.dropdown-menu-toggle
+%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
   %span.ci-status-text
     = name
   %span.badge= subject.size
-- 
cgit v1.2.1