From c01c937151526f5ab55ecfe7a5e8f84c9081f05b Mon Sep 17 00:00:00 2001 From: Mark VanLandingham Date: Tue, 7 Jan 2020 16:01:11 -0600 Subject: [PATCH] DEV: Allow returning non-objects from addToolbarPopupMenuOptionsCallback (#8677) --- .../javascripts/discourse/controllers/composer.js.es6 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 1e2414894ae..33f5d66bb59 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -247,7 +247,10 @@ export default Controller.extend({ }, _setupPopupMenuOption(callback) { - let option = callback(); + let option = callback(this); + if (typeof option === "undefined") { + return null; + } if (typeof option.condition === "undefined") { option.condition = true; @@ -288,9 +291,9 @@ export default Controller.extend({ ); return options.concat( - _popupMenuOptionsCallbacks.map(callback => - this._setupPopupMenuOption(callback) - ) + _popupMenuOptionsCallbacks + .map(callback => this._setupPopupMenuOption(callback)) + .filter(o => o) ); } },