From 3a81c8fd42449914e8e40ac1b55f638d8c140d36 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Aug 2021 17:49:06 -0400 Subject: [PATCH] fix: taskbar icon not pushed via composer/persona @antosik, partially reverted your PR: https://github.com/NodeBB/NodeBB/commit/342503e07add0edd135549b8f554b6ffa6df830d just specifically this file: https://github.com/NodeBB/NodeBB/blob/342503e07add0edd135549b8f554b6ffa6df830d/public/src/modules/taskbar.js I'm not 100% sure, but it might be because this hook is called sooner than the hook being registered? https://github.com/NodeBB/nodebb-theme-persona/blob/master/public/persona.js#L100-L101 @julianlam --- public/src/modules/taskbar.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js index 1c8b2165bb..10ee0da251 100644 --- a/public/src/modules/taskbar.js +++ b/public/src/modules/taskbar.js @@ -1,7 +1,7 @@ 'use strict'; -define('taskbar', ['benchpress', 'translator', 'hooks'], function (Benchpress, translator, hooks) { +define('taskbar', ['benchpress', 'translator'], function (Benchpress, translator) { var taskbar = {}; taskbar.init = function () { @@ -89,7 +89,7 @@ define('taskbar', ['benchpress', 'translator', 'hooks'], function (Benchpress, t element: element, }; - hooks.fire('filter:taskbar.push', data); + $(window).trigger('filter:taskbar.push', data); if (!element.length && data.module) { createTaskbarItem(data, callback); @@ -116,7 +116,7 @@ define('taskbar', ['benchpress', 'translator', 'hooks'], function (Benchpress, t btnEl.toggleClass('new', state); if (!silent) { - hooks.fire('action:taskbar.toggleNew', uuid); + $(window).trigger('action:taskbar.toggleNew', uuid); } }; @@ -175,7 +175,7 @@ define('taskbar', ['benchpress', 'translator', 'hooks'], function (Benchpress, t data.element = taskbarEl; taskbarEl.data(data); - hooks.fire('action:taskbar.pushed', data); + $(window).trigger('action:taskbar.pushed', data); callback(taskbarEl); }); } @@ -213,4 +213,4 @@ define('taskbar', ['benchpress', 'translator', 'hooks'], function (Benchpress, t }; return taskbar; -}); +}); \ No newline at end of file