diff --git a/ghost/admin/app/components/multi-list/item.js b/ghost/admin/app/components/multi-list/item.js index c3d2169b99..c7c339e807 100644 --- a/ghost/admin/app/components/multi-list/item.js +++ b/ghost/admin/app/components/multi-list/item.js @@ -35,6 +35,12 @@ export default class ItemComponent extends Component { if (!this.selectionList.enabled) { return; } + + // If event target has data-ignore-select or one of its partens, then ignore the event + if (event.target.closest('[data-ignore-select]')) { + return; + } + const shiftKey = event.shiftKey; const ctrlKey = event.ctrlKey || event.metaKey; @@ -61,6 +67,12 @@ export default class ItemComponent extends Component { if (!this.selectionList.enabled) { return; } + + // If event target has data-ignore-select or one of its partens, then ignore the event + if (event.target.closest('[data-ignore-select]')) { + return; + } + const shiftKey = event.shiftKey; const ctrlKey = event.ctrlKey || event.metaKey; @@ -78,6 +90,12 @@ export default class ItemComponent extends Component { if (!this.selectionList.enabled) { return; } + + // If event target has data-ignore-select or one of its partens, then ignore the event + if (event.target.closest('[data-ignore-select]')) { + return; + } + let x = event.clientX; let y = event.clientY; diff --git a/ghost/admin/app/components/posts-list/list-item.hbs b/ghost/admin/app/components/posts-list/list-item.hbs index 865d28fa26..234c511c33 100644 --- a/ghost/admin/app/components/posts-list/list-item.hbs +++ b/ghost/admin/app/components/posts-list/list-item.hbs @@ -187,20 +187,20 @@ {{!-- Button column --}} {{#if @post.hasAnalyticsPage }} - + {{svg-jar "stats" title="Go to Analytics"}} {{else}} {{#if (and this.session.user.isContributor @post.isPublished)}} {{else}} - + {{svg-jar "pen" title="Go to Editor"}} diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css index 8b562a913c..5dabcf8bfa 100644 --- a/ghost/admin/app/styles/layouts/content.css +++ b/ghost/admin/app/styles/layouts/content.css @@ -179,6 +179,11 @@ pointer-events: none; } +.posts-list[data-ctrl] .gh-posts-list-item-group * [data-ignore-select]{ + pointer-events: all; + cursor: pointer !important; +} + .posts-list .gh-posts-list-item-group:hover { background: linear-gradient(315deg, var(--whitegrey-l2) 60%, var(--white) 100%); }