FIX: Support for menu glyphs that are optional

2017-09-26 09:50:43 -04:00 · 2017-09-26 09:50:43 -04:00 · 9e17fd8907
parent faa37c3070
commit 9e17fd8907
1 changed files with 8 additions and 3 deletions
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@ -23,9 +23,14 @@ createWidget('user-menu-links', {
    const glyphs = [];

    if (extraGlyphs) {
-      // yes glyphs.push(...extraGlyphs) is nicer, but pulling in
-      // _toConsumableArray seems totally uneeded here
-      glyphs.push.apply(glyphs, extraGlyphs);
+      extraGlyphs.forEach(g => {
+        if (typeof g === "function") {
+          g = g(this);
+        }
+        if (g) {
+          glyphs.push(g);
+        }
+      });
    }

    glyphs.push({ label: 'user.bookmarks',