From 38be86ec51036cdc69dee82c8d03603fde5aa872 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 26 Jun 2020 16:05:35 +0200 Subject: [PATCH] Fix extension to work with latest state changes Refs flarum/core#2150, flarum/core#2156. --- extensions/sticky/js/src/forum/addStickyControl.js | 4 ++-- extensions/sticky/js/src/forum/addStickyExcerpt.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/sticky/js/src/forum/addStickyControl.js b/extensions/sticky/js/src/forum/addStickyControl.js index 6b8aa7d66..c9ba2a5b1 100644 --- a/extensions/sticky/js/src/forum/addStickyControl.js +++ b/extensions/sticky/js/src/forum/addStickyControl.js @@ -16,8 +16,8 @@ export default function addStickyControl() { DiscussionControls.stickyAction = function() { this.save({isSticky: !this.isSticky()}).then(() => { - if (app.current instanceof DiscussionPage) { - app.current.stream.update(); + if (app.current.matches(DiscussionPage)) { + app.current.get('stream').update(); } m.redraw(); diff --git a/extensions/sticky/js/src/forum/addStickyExcerpt.js b/extensions/sticky/js/src/forum/addStickyExcerpt.js index a50b0f24e..c91056745 100644 --- a/extensions/sticky/js/src/forum/addStickyExcerpt.js +++ b/extensions/sticky/js/src/forum/addStickyExcerpt.js @@ -1,10 +1,10 @@ import { extend } from 'flarum/extend'; -import DiscussionList from 'flarum/components/DiscussionList'; +import DiscussionListState from 'flarum/states/DiscussionListState'; import DiscussionListItem from 'flarum/components/DiscussionListItem'; import { truncate } from 'flarum/utils/string'; export default function addStickyControl() { - extend(DiscussionList.prototype, 'requestParams', function(params) { + extend(DiscussionListState.prototype, 'requestParams', function(params) { params.include.push('firstPost'); });