]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'drawing_updates'
authorDan Brown <redacted>
Sun, 27 May 2018 18:42:25 +0000 (19:42 +0100)
committerDan Brown <redacted>
Sun, 27 May 2018 18:42:25 +0000 (19:42 +0100)
1  2 
resources/assets/js/components/wysiwyg-editor.js
resources/lang/en/settings.php
resources/lang/sv/components.php
routes/web.php

index 701a1fec60c539064d4fb5a31d2a8b21aae205b9,72263e2f271452e445a4340cef8b34544c6c3f2a..f7e9bfeedfe6e506662d851b156852f9a22d4554
@@@ -291,9 -306,19 +306,19 @@@ function drawIoPlugin() 
          });
  
          editor.addButton('drawio', {
+             type: 'splitbutton',
              tooltip: 'Drawing',
 -            image: window.baseUrl('/icon/drawing.svg?color=000000'),
 +            image: `data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIGZpbGw9IiMwMDAwMDAiICB4bWxucz0iaHR0cDovL3d3 dy53My5vcmcvMjAwMC9zdmciPgogICAgPHBhdGggZD0iTTIzIDdWMWgtNnYySDdWMUgxdjZoMnYx MEgxdjZoNnYtMmgxMHYyaDZ2LTZoLTJWN2gyek0zIDNoMnYySDNWM3ptMiAxOEgzdi0yaDJ2Mnpt MTItMkg3di0ySDVWN2gyVjVoMTB2MmgydjEwaC0ydjJ6bTQgMmgtMnYtMmgydjJ6TTE5IDVWM2gy djJoLTJ6bS01LjI3IDloLTMuNDlsLS43MyAySDcuODlsMy40LTloMS40bDMuNDEgOWgtMS42M2wt Ljc0LTJ6bS0zLjA0LTEuMjZoMi42MUwxMiA4LjkxbC0xLjMxIDMuODN6Ii8+CiAgICA8cGF0aCBk PSJNMCAwaDI0djI0SDB6IiBmaWxsPSJub25lIi8+Cjwvc3ZnPg==`,
-             cmd: 'drawio'
+             cmd: 'drawio',
+             menu: [
+                 {
+                     text: 'Drawing Manager',
+                     onclick() {
+                         let selectedNode = editor.selection.getNode();
+                         showDrawingManager(editor, isDrawing(selectedNode) ? selectedNode : null);
+                     }
+                 }
+             ]
          });
  
          editor.on('dblclick', event => {
Simple merge
Simple merge
diff --cc routes/web.php
Simple merge