Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Allow returning non-objects from addToolbarPopupMenuOptionsCallback (#8677)

This commit is contained in:
Mark VanLandingham 2020-01-07 16:01:11 -06:00 committed by GitHub
parent cae60b5900
commit c01c937151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -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)
);
}
},