IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: handles boolean with popupMenuOption (#7299)

Browse Source 
Handle the case of https://github.com/discourse/DiscoTOC doing this kind of setup:

```
return {
    action: "insertDtoc",
    icon: "align-left",
    label: themePrefix("insert_table_of_contents"),
    condition: !composerController.get("model.canCategorize")
  };
```

In this case there's no function to call, it's already set.
This commit is contained in:
Joffrey JAFFEUX 2019-04-01 16:08:14 +02:00 committed by GitHub
parent a6596662dc
commit 4b1b135ede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,10 +255,12 @@ export default Ember.Controller.extend({
_setupPopupMenuOption(callback) { _setupPopupMenuOption(callback) {
let option = callback(); let option = callback();
if (option.condition) { if (typeof option.condition === "undefined") {
option.condition = this.get(option.condition);
} else {
option.condition = true; option.condition = true;
} else if (typeof option.condition === "boolean") {
// uses existing value
} else {
option.condition = this.get(option.condition);
} }
return option; return option;