From 102eec827c6fc53e3153b656abc192055e31489d Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Thu, 13 Apr 2017 12:22:43 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20content=20filters=20jumpin?= =?UTF-8?q?g=20when=20loading=20screen=20is=20shown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no issue - ensure content filters in the loading screen have the same styles - add session injection to `posts-loading` controller so that the authors dropdown doesn't appear when changing filters when logged in as an author --- ghost/admin/app/controllers/posts-loading.js | 2 ++ ghost/admin/app/templates/posts-loading.hbs | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/ghost/admin/app/controllers/posts-loading.js b/ghost/admin/app/controllers/posts-loading.js index 80acc04921..c638341eb0 100644 --- a/ghost/admin/app/controllers/posts-loading.js +++ b/ghost/admin/app/controllers/posts-loading.js @@ -1,10 +1,12 @@ import Controller from 'ember-controller'; import {readOnly} from 'ember-computed'; import injectController from 'ember-controller/inject'; +import injectService from 'ember-service/inject'; export default Controller.extend({ postsController: injectController('posts'), + session: injectService(), availableTypes: readOnly('postsController.availableTypes'), selectedType: readOnly('postsController.selectedType'), diff --git a/ghost/admin/app/templates/posts-loading.hbs b/ghost/admin/app/templates/posts-loading.hbs index 1d6f4f28d8..bb63084fe5 100644 --- a/ghost/admin/app/templates/posts-loading.hbs +++ b/ghost/admin/app/templates/posts-loading.hbs @@ -18,6 +18,7 @@ classNames="gh-contentfilter-menu gh-contentfilter-type" triggerClass="gh-contentfilter-menu-trigger" dropdownClass="gh-contentfilter-menu-dropdown" + matchTriggerWidth=false data-test-type-select=true as |type| }} @@ -35,6 +36,7 @@ classNames="gh-contentfilter-menu gh-contentfilter-author" triggerClass="gh-contentfilter-menu-trigger" dropdownClass="gh-contentfilter-menu-dropdown" + matchTriggerWidth=false data-test-author-select=true as |author| }} @@ -52,6 +54,8 @@ classNames="gh-contentfilter-menu gh-contentfilter-tag" triggerClass="gh-contentfilter-menu-trigger" dropdownClass="gh-contentfilter-menu-dropdown" + searchPlaceholder="Search tags" + matchTriggerWidth=false data-test-tag-select=true as |tag| }} @@ -69,6 +73,8 @@ classNames="gh-contentfilter-menu gh-contentfilter-sort" triggerClass="gh-contentfilter-menu-trigger" dropdownClass="gh-contentfilter-menu-dropdown" + horizontalPosition="right" + matchTriggerWidth=false data-test-order-select=true as |order| }}