Merge remote-tracking branch 'origin/stable'

src/public/app/widgets/dialogs/about.js

@@ -38,7 +38,7 @@ const TPL = `
 
                     <tr>
                         <th>Build revision:</th>
-                        <td><a href="" class="external" target="_blank" class="build-revision"></a></td>
+                        <td><a href="" class="build-revision external" target="_blank"></a></td>
                     </tr>
 
                     <tr>

src/public/app/widgets/mermaid.js

@@ -61,7 +61,7 @@ export default class MermaidWidget extends NoteContextAwareWidget {
             gantt: { useMaxWidth: false },
             "class": { useMaxWidth: false },
             state: { useMaxWidth: false },
-            pie: { useMaxWidth: false },
+            pie: { useMaxWidth: true },
             journey: { useMaxWidth: false },
             git: { useMaxWidth: false },
         });

src/public/app/widgets/toc.js

@@ -152,7 +152,9 @@ export default class TocWidget extends CollapsibleWidget {
             //
             // Create the list item and set up the click callback
             //
-            const $li = $('<li style="cursor:pointer">' + m[2] + '</li>');
+
+            const headingText = $("<div>").html(m[2]).text();
+            const $li = $('<li style="cursor:pointer">').text(headingText);
             // XXX Do this with CSS? How to inject CSS in doRender?
             $li.hover(function () {
                 $(this).css("font-weight", "bold");