kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

converted last method to jQuery

Browse source
This commit is contained in:
Luke Bennett 2016-10-20 22:18:39 +01:00
parent c1be12d0fc
commit 599f1cb023
No known key found for this signature in database
GPG key ID: A738E9C68D3BF31A
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/extensions/element.js.es6 Normal file
View file

@ -0,0 +1,6 @@
Element.prototype.matches = Element.prototype.matches || Element.prototype.msMatches;
Element.prototype.closest = function closest(selector, selectedElement = this) {
if (!selectedElement) return;
return selectedElement.matches(selector) ? selectedElement : Element.prototype.closest(selector, selectedElement.parentElement);
};

27
app/assets/javascripts/pipelines.js.es6
View file

@ -7,9 +7,9 @@
} }
initGraphToggle() { initGraphToggle() {
this.pipelineGraph = document.querySelector('.pipeline-graph');
this.toggleButton = document.querySelector('.toggle-pipeline-btn'); this.toggleButton = document.querySelector('.toggle-pipeline-btn');
this.toggleButtonText = this.toggleButton.querySelector('.toggle-btn-text'); this.toggleButtonText = this.toggleButton.querySelector('.toggle-btn-text');
this.pipelineGraph = document.querySelector('.pipeline-graph');
this.toggleButton.addEventListener('click', this.toggleGraph.bind(this)); this.toggleButton.addEventListener('click', this.toggleGraph.bind(this));
} }
@ -17,21 +17,22 @@
const graphCollapsed = this.pipelineGraph.classList.contains('graph-collapsed'); const graphCollapsed = this.pipelineGraph.classList.contains('graph-collapsed');
this.toggleButton.classList.toggle('graph-collapsed'); this.toggleButton.classList.toggle('graph-collapsed');
this.pipelineGraph.classList.toggle('graph-collapsed'); this.pipelineGraph.classList.toggle('graph-collapsed');
graphCollapsed ? this.toggleButtonText.textContent = 'Hide' : this.toggleButtonText.textContent = 'Expand'; this.toggleButtonText.textContent = graphCollapsed ? 'Hide' : 'Expand';
} }
addMarginToBuildColumns() { addMarginToBuildColumns() {
const $secondChildBuildNode = $('.build:nth-child(2)'); const secondChildBuildNodes = this.pipelineGraph.querySelectorAll('.build:nth-child(2)');
if ($secondChildBuildNode.length) { for (buildNodeIndex in secondChildBuildNodes) {
const $firstChildBuildNode = $secondChildBuildNode.prev('.build'); const buildNode = secondChildBuildNodes[buildNodeIndex];
const $multiBuildColumn = $secondChildBuildNode.closest('.stage-column'); const firstChildBuildNode = buildNode.previousElementSibling;
const $previousColumn = $multiBuildColumn.prev('.stage-column'); if (!firstChildBuildNode || !firstChildBuildNode.matches('.build')) continue;
$multiBuildColumn.addClass('left-margin'); const multiBuildColumn = buildNode.closest('.stage-column');
$firstChildBuildNode.addClass('left-connector'); const previousColumn = multiBuildColumn.previousElementSibling;
$previousColumn.each(function() { if (!previousColumn || !previousColumn.matches('.stage-column')) continue;
$this = $(this); multiBuildColumn.classList.add('left-margin');
if ($('.build', $this).length === 1) $this.addClass('no-margin'); firstChildBuildNode.classList.add('left-connector');
}); const columnBuilds = previousColumn.querySelectorAll('.build');
if (columnBuilds.length === 1) previousColumn.classList.add('no-margin');
} }
this.pipelineGraph.classList.remove('hidden'); this.pipelineGraph.classList.remove('hidden');
} }