Commit 5c7fd643 authored by Phil Hughes's avatar Phil Hughes

Fixed blank state nevermind button

parent a996eecc
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
} }
}, },
methods: { methods: {
addDefaultLists (e) { addDefaultLists () {
e.stopImmediatePropagation();
BoardsStore.removeBlankState(); BoardsStore.removeBlankState();
for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) { for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) {
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
return $.cookie('issue_board_welcome_hidden') === 'true'; return $.cookie('issue_board_welcome_hidden') === 'true';
}, },
removeList (id) { removeList (id) {
const list = this.findList('id', id); const list = this.findList('id', id, 'blank');
if (!list) return; if (!list) return;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
{{ label.title }} {{ label.title }}
%p %p
Starting out with the default set of lists will get you right on the way to making the most of your board. Starting out with the default set of lists will get you right on the way to making the most of your board.
%button.btn.btn-create.btn-inverted.btn-block{ type: "button", "@click" => "addDefaultLists" } %button.btn.btn-create.btn-inverted.btn-block{ type: "button", "@click.stop" => "addDefaultLists" }
Add default lists Add default lists
%button.btn.btn-default.btn-block{ type: "button", "@click" => "clearBlankState" } %button.btn.btn-default.btn-block{ type: "button", "@click.stop" => "clearBlankState" }
Nevermind, I'll use my own Nevermind, I'll use my own
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
%board-delete{ "inline-template" => true, %board-delete{ "inline-template" => true,
"v-if" => "!isPreset", "v-if" => "!isPreset",
":list" => "list" } ":list" => "list" }
%button.board-delete.has-tooltip.pull-right{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click" => "deleteBoard" } %button.board-delete.has-tooltip.pull-right{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
= icon("trash") = icon("trash")
= icon("spinner spin", class: "board-header-loading-spinner pull-right", "v-show" => "list.loadingMore") = icon("spinner spin", class: "board-header-loading-spinner pull-right", "v-show" => "list.loadingMore")
.board-inner-container.board-search-container{ "v-if" => "list.canSearch()" } .board-inner-container.board-search-container{ "v-if" => "list.canSearch()" }
......
...@@ -26,7 +26,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -26,7 +26,7 @@ describe 'Issue Boards', feature: true, js: true do
it 'hides the blank state when clicking nevermind button' do it 'hides the blank state when clicking nevermind button' do
page.within('.board-blank-state') do page.within('.board-blank-state') do
click_button('Nevermind, I\'ll use my own') click_button("Nevermind, I'll use my own")
end end
expect(page).to have_selector('.board', count: 2) expect(page).to have_selector('.board', count: 2)
end end
......
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