diff options
5 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/javascripts/boards/components/board_blank_state.js.es6 b/app/assets/javascripts/boards/components/board_blank_state.js.es6 index 7c3f4073089..31f416c4dae 100644 --- a/app/assets/javascripts/boards/components/board_blank_state.js.es6 +++ b/app/assets/javascripts/boards/components/board_blank_state.js.es6 @@ -11,8 +11,7 @@ } }, methods: { - addDefaultLists (e) { - e.stopImmediatePropagation(); + addDefaultLists () { BoardsStore.removeBlankState(); for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) { diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index bc330ba9507..cddedb35509 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -65,7 +65,7 @@ return $.cookie('issue_board_welcome_hidden') === 'true'; }, removeList (id) { - const list = this.findList('id', id); + const list = this.findList('id', id, 'blank'); if (!list) return; diff --git a/app/views/projects/boards/components/_blank_state.html.haml b/app/views/projects/boards/components/_blank_state.html.haml index 661314dba8c..97eb952eff1 100644 --- a/app/views/projects/boards/components/_blank_state.html.haml +++ b/app/views/projects/boards/components/_blank_state.html.haml @@ -9,7 +9,7 @@ {{ label.title }} %p 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 - %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 diff --git a/app/views/projects/boards/components/_board.html.haml b/app/views/projects/boards/components/_board.html.haml index e30a8f50c35..193e046fc02 100644 --- a/app/views/projects/boards/components/_board.html.haml +++ b/app/views/projects/boards/components/_board.html.haml @@ -16,7 +16,7 @@ %board-delete{ "inline-template" => true, "v-if" => "!isPreset", ":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("spinner spin", class: "board-header-loading-spinner pull-right", "v-show" => "list.loadingMore") .board-inner-container.board-search-container{ "v-if" => "list.canSearch()" } diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index 0d023021b72..13bf440cc8f 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -26,7 +26,7 @@ describe 'Issue Boards', feature: true, js: true do it 'hides the blank state when clicking nevermind button' do page.within('.board-blank-state') do - click_button('Nevermind, I\'ll use my own') + click_button("Nevermind, I'll use my own") end expect(page).to have_selector('.board', count: 2) end |