Commit cc7b3db5 authored by Annabel Dunstone's avatar Annabel Dunstone

Remove params from build; general refactor

parent b6c670cf
...@@ -6,11 +6,12 @@ ...@@ -6,11 +6,12 @@
Build.state = null; Build.state = null;
function Build(page_url, build_url, build_status, build_stage, build_name, state1) { function Build(options) {
this.page_url = page_url; this.page_url = options.page_url;
this.build_url = build_url; this.build_url = options.build_url;
this.build_status = build_status; this.build_status = options.build_status;
this.state = state1; this.state = options.state1;
this.build_stage = options.build_stage;
this.hideSidebar = bind(this.hideSidebar, this); this.hideSidebar = bind(this.hideSidebar, this);
this.toggleSidebar = bind(this.toggleSidebar, this); this.toggleSidebar = bind(this.toggleSidebar, this);
this.updateDropdown = bind(this.updateDropdown, this); this.updateDropdown = bind(this.updateDropdown, this);
...@@ -18,13 +19,13 @@ ...@@ -18,13 +19,13 @@
this.bp = Breakpoints.get(); this.bp = Breakpoints.get();
$('.js-build-sidebar').niceScroll(); $('.js-build-sidebar').niceScroll();
this.populateJobs(build_stage); this.populateJobs(this.build_stage);
this.updateStageDropdownText(build_stage); this.updateStageDropdownText(this.build_stage);
this.hideSidebar(); this.hideSidebar();
$(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar); $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
$(window).off('resize.build').on('resize.build', this.hideSidebar); $(window).off('resize.build').on('resize.build', this.hideSidebar);
$(document).on('click', '.stage-item', this.updateDropdown); $(document).off('click', '.stage-item').on('click', '.stage-item', this.updateDropdown);
this.updateArtifactRemoveDate(); this.updateArtifactRemoveDate();
if ($('#build-trace').length) { if ($('#build-trace').length) {
this.getInitialBuildTrace(); this.getInitialBuildTrace();
...@@ -149,7 +150,7 @@ ...@@ -149,7 +150,7 @@
Build.prototype.updateDropdown = function(e) { Build.prototype.updateDropdown = function(e) {
e.preventDefault(); e.preventDefault();
var stage = e.target.text; var stage = e.currentTarget.text;
this.updateStageDropdownText(stage); this.updateStageDropdownText(stage);
this.populateJobs(stage); this.populateJobs(stage);
}; };
......
...@@ -136,6 +136,12 @@ ...@@ -136,6 +136,12 @@
.dropdown-menu-toggle { .dropdown-menu-toggle {
margin-top: 8px; margin-top: 8px;
} }
.dropdown-menu {
right: $gl-padding;
left: $gl-padding;
width: auto;
}
} }
.builds-container { .builds-container {
......
...@@ -47,4 +47,10 @@ ...@@ -47,4 +47,10 @@
= render "sidebar" = render "sidebar"
:javascript :javascript
new Build("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{@build.stage}", "#{@build.name}", "#{trace_with_state[:state]}") new Build({
page_url: "#{namespace_project_build_url(@project.namespace, @project, @build)}",
build_url: "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}",
build_status: "#{@build.status}",
build_stage: "#{@build.stage}",
state1: "#{trace_with_state[:state]}"
})
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment