From 09bac6bd7e70de0b21a257c3e015bf786432449e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 25 Jun 2021 16:52:46 -0400 Subject: [PATCH] fix: convert some hooks to use hooks module re: julianlam/nodebb-plugin-markdown#130 --- public/src/client/account/posts.js | 4 ++-- public/src/client/categories.js | 4 ++-- public/src/client/topic.js | 9 +++++++-- public/src/client/topic/posts.js | 5 +++-- public/src/client/topic/replies.js | 4 ++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/public/src/client/account/posts.js b/public/src/client/account/posts.js index ed9629ef5a..dbf1a6f7d8 100644 --- a/public/src/client/account/posts.js +++ b/public/src/client/account/posts.js @@ -1,7 +1,7 @@ 'use strict'; -define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], function (header, infinitescroll) { +define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll', 'hooks'], function (header, infinitescroll, hooks) { var AccountPosts = {}; var template; @@ -47,7 +47,7 @@ define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); - $(window).trigger('action:posts.loaded', { posts: posts }); + hooks.fire('action:posts.loaded', { posts: posts }); callback(); }); } diff --git a/public/src/client/categories.js b/public/src/client/categories.js index e567b805d9..c7a05e7af5 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -1,7 +1,7 @@ 'use strict'; -define('forum/categories', ['components', 'categorySelector'], function (components, categorySelector) { +define('forum/categories', ['components', 'categorySelector', 'hooks'], function (components, categorySelector, hooks) { var categories = {}; $(window).on('action:ajaxify.start', function (ev, data) { @@ -63,7 +63,7 @@ define('forum/categories', ['components', 'categorySelector'], function (compone recentPosts.last().remove(); } - $(window).trigger('action:posts.loaded', { posts: [post] }); + hooks.fire('action:posts.loaded', { posts: [post] }); }); } diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 9e186457ea..d0b57264c8 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -12,7 +12,12 @@ define('forum/topic', [ 'sort', 'components', 'storage', -], function (infinitescroll, threadTools, postTools, events, posts, images, navigator, sort, components, storage) { + 'hooks', +], function ( + infinitescroll, threadTools, postTools, + events, posts, images, navigator, sort, + components, storage, hooks +) { var Topic = {}; var currentUrl = ''; @@ -70,7 +75,7 @@ define('forum/topic', [ handleTopicSearch(); - $(window).trigger('action:topic.loaded', ajaxify.data); + hooks.fire('action:topic.loaded', ajaxify.data); }; function handleTopicSearch() { diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index a0e098266a..102e353740 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -9,7 +9,8 @@ define('forum/topic/posts', [ 'navigator', 'components', 'translator', -], function (pagination, infinitescroll, postTools, images, navigator, components, translator) { + 'hooks', +], function (pagination, infinitescroll, postTools, images, navigator, components, translator, hooks) { var Posts = { }; Posts.onNewPost = function (data) { @@ -226,7 +227,7 @@ define('forum/topic/posts', [ infinitescroll.removeExtra($('[component="post"]'), direction, Math.max(20, config.postsPerPage * 2)); - $(window).trigger('action:posts.loaded', { posts: data.posts }); + hooks.fire('action:posts.loaded', { posts: data.posts }); Posts.onNewPostsAddedToDom(html); diff --git a/public/src/client/topic/replies.js b/public/src/client/topic/replies.js index 57d63f4672..bc017d25f6 100644 --- a/public/src/client/topic/replies.js +++ b/public/src/client/topic/replies.js @@ -1,7 +1,7 @@ 'use strict'; -define('forum/topic/replies', ['navigator', 'components', 'forum/topic/posts'], function (navigator, components, posts) { +define('forum/topic/replies', ['navigator', 'components', 'forum/topic/posts', 'hooks'], function (navigator, components, posts, hooks) { var Replies = {}; Replies.init = function (button) { @@ -43,7 +43,7 @@ define('forum/topic/replies', ['navigator', 'components', 'forum/topic/posts'], repliesEl.slideDown('fast'); posts.onNewPostsAddedToDom(html); - $(window).trigger('action:posts.loaded', { posts: data }); + hooks.fire('action:posts.loaded', { posts: data }); }); }); } else if (close.is(':not(.hidden)')) {