mirror of
https://github.com/discourse/discourse.git
synced 2025-02-26 19:27:25 +08:00
DEV: Make filterModes obsolete
This mixin handles the translation between old filterModes and new filterTypes. filterModes have context information, filterTypes do not.
This commit is contained in:
parent
3d1b6b6729
commit
a8d58c3b21
app/assets/javascripts/discourse
components
controllers
routes
@ -2,8 +2,9 @@ import discourseComputed from "discourse-common/utils/decorators";
|
|||||||
import NavItem from "discourse/models/nav-item";
|
import NavItem from "discourse/models/nav-item";
|
||||||
import { inject as service } from "@ember/service";
|
import { inject as service } from "@ember/service";
|
||||||
import Component from "@ember/component";
|
import Component from "@ember/component";
|
||||||
|
import FilterModeMixin from "discourse/mixins/filter-mode";
|
||||||
|
|
||||||
export default Component.extend({
|
export default Component.extend(FilterModeMixin, {
|
||||||
router: service(),
|
router: service(),
|
||||||
persistedQueryParams: null,
|
persistedQueryParams: null,
|
||||||
|
|
||||||
|
@ -6,8 +6,9 @@ import {
|
|||||||
} from "discourse-common/utils/decorators";
|
} from "discourse-common/utils/decorators";
|
||||||
import DiscourseURL from "discourse/lib/url";
|
import DiscourseURL from "discourse/lib/url";
|
||||||
import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
|
import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
|
||||||
|
import FilterModeMixin from "discourse/mixins/filter-mode";
|
||||||
|
|
||||||
export default Component.extend({
|
export default Component.extend(FilterModeMixin, {
|
||||||
tagName: "ul",
|
tagName: "ul",
|
||||||
classNameBindings: [":nav", ":nav-pills"],
|
classNameBindings: [":nav", ":nav-pills"],
|
||||||
elementId: "navigation-bar",
|
elementId: "navigation-bar",
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
import discourseComputed from "discourse-common/utils/decorators";
|
import discourseComputed from "discourse-common/utils/decorators";
|
||||||
import Component from "@ember/component";
|
import Component from "@ember/component";
|
||||||
import { bufferedRender } from "discourse-common/lib/buffered-render";
|
import { bufferedRender } from "discourse-common/lib/buffered-render";
|
||||||
|
import FilterModeMixin from "discourse/mixins/filter-mode";
|
||||||
|
|
||||||
export default Component.extend(
|
export default Component.extend(
|
||||||
|
FilterModeMixin,
|
||||||
bufferedRender({
|
bufferedRender({
|
||||||
tagName: "li",
|
tagName: "li",
|
||||||
classNameBindings: [
|
classNameBindings: [
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
import { none, and } from "@ember/object/computed";
|
import { none, and } from "@ember/object/computed";
|
||||||
import NavigationDefaultController from "discourse/controllers/navigation/default";
|
import NavigationDefaultController from "discourse/controllers/navigation/default";
|
||||||
|
import FilterModeMixin from "discourse/mixins/filter-mode";
|
||||||
|
|
||||||
export default NavigationDefaultController.extend({
|
export default NavigationDefaultController.extend(FilterModeMixin, {
|
||||||
showingParentCategory: none("category.parentCategory"),
|
showingParentCategory: none("category.parentCategory"),
|
||||||
showingSubcategoryList: and(
|
showingSubcategoryList: and(
|
||||||
"category.show_subcategory_list",
|
"category.show_subcategory_list",
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
import discourseComputed from "discourse-common/utils/decorators";
|
import discourseComputed from "discourse-common/utils/decorators";
|
||||||
import { inject } from "@ember/controller";
|
import { inject } from "@ember/controller";
|
||||||
import Controller from "@ember/controller";
|
import Controller from "@ember/controller";
|
||||||
|
import FilterModeMixin from "discourse/mixins/filter-mode";
|
||||||
|
|
||||||
export default Controller.extend({
|
export default Controller.extend(FilterModeMixin, {
|
||||||
discovery: inject(),
|
discovery: inject(),
|
||||||
discoveryTopics: inject("discovery/topics"),
|
discoveryTopics: inject("discovery/topics"),
|
||||||
|
|
||||||
|
@ -7,15 +7,15 @@ import {
|
|||||||
} from "discourse-common/utils/decorators";
|
} from "discourse-common/utils/decorators";
|
||||||
import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
|
import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
|
||||||
import { default as NavItem } from "discourse/models/nav-item";
|
import { default as NavItem } from "discourse/models/nav-item";
|
||||||
|
import FilterModeMixin from "discourse/mixins/filter-mode";
|
||||||
|
|
||||||
export default Controller.extend(BulkTopicSelection, {
|
export default Controller.extend(BulkTopicSelection, FilterModeMixin, {
|
||||||
application: inject(),
|
application: inject(),
|
||||||
|
|
||||||
tag: null,
|
tag: null,
|
||||||
additionalTags: null,
|
additionalTags: null,
|
||||||
list: null,
|
list: null,
|
||||||
canAdminTag: alias("currentUser.staff"),
|
canAdminTag: alias("currentUser.staff"),
|
||||||
filterMode: null,
|
|
||||||
navMode: "latest",
|
navMode: "latest",
|
||||||
loading: false,
|
loading: false,
|
||||||
canCreateTopic: false,
|
canCreateTopic: false,
|
||||||
|
@ -8,8 +8,9 @@ import {
|
|||||||
import { queryParams } from "discourse/controllers/discovery-sortable";
|
import { queryParams } from "discourse/controllers/discovery-sortable";
|
||||||
import PermissionType from "discourse/models/permission-type";
|
import PermissionType from "discourse/models/permission-type";
|
||||||
import Category from "discourse/models/category";
|
import Category from "discourse/models/category";
|
||||||
|
import FilterModeMixin from "discourse/mixins/filter-mode";
|
||||||
|
|
||||||
export default DiscourseRoute.extend({
|
export default DiscourseRoute.extend(FilterModeMixin, {
|
||||||
navMode: "latest",
|
navMode: "latest",
|
||||||
|
|
||||||
queryParams,
|
queryParams,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user