Commit 0b50c922 authored by Phil Hughes's avatar Phil Hughes Committed by Jose Ivan Vargas

Revert "Merge branch '37179-dashboard-project-dropdown' into 'master'"

This reverts commit 6d6223ec, reversing
changes made to cc781170.
parent 89e2feab
...@@ -14,14 +14,7 @@ export default class ProjectSelectComboButton { ...@@ -14,14 +14,7 @@ export default class ProjectSelectComboButton {
bindEvents() { bindEvents() {
this.projectSelectInput.siblings('.new-project-item-select-button') this.projectSelectInput.siblings('.new-project-item-select-button')
.on('click', e => this.openDropdown(e)); .on('click', this.openDropdown);
this.newItemBtn.on('click', (e) => {
if (!this.getProjectFromLocalStorage()) {
e.preventDefault();
this.openDropdown(e);
}
});
this.projectSelectInput.on('change', () => this.selectProject()); this.projectSelectInput.on('change', () => this.selectProject());
} }
...@@ -37,9 +30,8 @@ export default class ProjectSelectComboButton { ...@@ -37,9 +30,8 @@ export default class ProjectSelectComboButton {
} }
} }
// eslint-disable-next-line class-methods-use-this openDropdown() {
openDropdown(event) { $(this).siblings('.project-item-select').select2('open');
$(event.currentTarget).siblings('.project-item-select').select2('open');
} }
selectProject() { selectProject() {
...@@ -66,8 +58,10 @@ export default class ProjectSelectComboButton { ...@@ -66,8 +58,10 @@ export default class ProjectSelectComboButton {
if (project) { if (project) {
this.newItemBtn.attr('href', project.url); this.newItemBtn.attr('href', project.url);
this.newItemBtn.text(`${this.formattedText.defaultTextPrefix} in ${project.name}`); this.newItemBtn.text(`${this.formattedText.defaultTextPrefix} in ${project.name}`);
this.newItemBtn.enable();
} else { } else {
this.newItemBtn.text(`Select project to create ${this.formattedText.presetTextSuffix}`); this.newItemBtn.text(`Select project to create ${this.formattedText.presetTextSuffix}`);
this.newItemBtn.disable();
} }
} }
......
---
title: Removes disabled state from dashboard project button
merge_request:
author:
type: fixed
...@@ -32,6 +32,11 @@ describe('Project Select Combo Button', function () { ...@@ -32,6 +32,11 @@ describe('Project Select Combo Button', function () {
this.comboButton = new ProjectSelectComboButton(this.projectSelectInput); this.comboButton = new ProjectSelectComboButton(this.projectSelectInput);
}); });
it('newItemBtn is disabled', function () {
expect(this.newItemBtn.hasAttribute('disabled')).toBe(true);
expect(this.newItemBtn.classList.contains('disabled')).toBe(true);
});
it('newItemBtn href is null', function () { it('newItemBtn href is null', function () {
expect(this.newItemBtn.getAttribute('href')).toBe(''); expect(this.newItemBtn.getAttribute('href')).toBe('');
}); });
...@@ -48,6 +53,11 @@ describe('Project Select Combo Button', function () { ...@@ -48,6 +53,11 @@ describe('Project Select Combo Button', function () {
this.comboButton = new ProjectSelectComboButton(this.projectSelectInput); this.comboButton = new ProjectSelectComboButton(this.projectSelectInput);
}); });
it('newItemBtn is not disabled', function () {
expect(this.newItemBtn.hasAttribute('disabled')).toBe(false);
expect(this.newItemBtn.classList.contains('disabled')).toBe(false);
});
it('newItemBtn href is correctly set', function () { it('newItemBtn href is correctly set', function () {
expect(this.newItemBtn.getAttribute('href')).toBe(this.defaults.projectMeta.url); expect(this.newItemBtn.getAttribute('href')).toBe(this.defaults.projectMeta.url);
}); });
...@@ -72,6 +82,11 @@ describe('Project Select Combo Button', function () { ...@@ -72,6 +82,11 @@ describe('Project Select Combo Button', function () {
.trigger('change'); .trigger('change');
}); });
it('newItemBtn is not disabled', function () {
expect(this.newItemBtn.hasAttribute('disabled')).toBe(false);
expect(this.newItemBtn.classList.contains('disabled')).toBe(false);
});
it('newItemBtn href is correctly set', function () { it('newItemBtn href is correctly set', function () {
expect(this.newItemBtn.getAttribute('href')) expect(this.newItemBtn.getAttribute('href'))
.toBe('http://myothercoolproject.com/issues/new'); .toBe('http://myothercoolproject.com/issues/new');
......
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