From: Dan Brown Date: Sun, 27 May 2018 18:42:25 +0000 (+0100) Subject: Merge branch 'drawing_updates' X-Git-Tag: v0.22.0~1^2~5 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6b84a76af1917ff8e53c4636cb5fe08d1b40ccdd Merge branch 'drawing_updates' --- 6b84a76af1917ff8e53c4636cb5fe08d1b40ccdd diff --cc resources/assets/js/components/wysiwyg-editor.js index 701a1fec6,72263e2f2..f7e9bfeed --- a/resources/assets/js/components/wysiwyg-editor.js +++ b/resources/assets/js/components/wysiwyg-editor.js @@@ -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 => {