From 94871b21bcbb24fdc1a78e5602c41cc74605c3a9 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Fri, 18 Mar 2022 23:13:14 +0300 Subject: [PATCH 1/4] remove premium tinymce tools --- modules/ui/notes-editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ui/notes-editor.js b/modules/ui/notes-editor.js index 872437fa..b985a5e8 100644 --- a/modules/ui/notes-editor.js +++ b/modules/ui/notes-editor.js @@ -86,8 +86,8 @@ function editNotes(id, name) { selector: "#notesLegend", height: "90%", menubar: false, - plugins: `autolink lists link charmap print formatpainter casechange code fullscreen image link media table paste hr checklist wordcount`, - toolbar: `code | undo redo | bold italic strikethrough | forecolor backcolor | formatpainter removeformat | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media table | fontselect fontsizeselect | blockquote hr casechange checklist charmap | print fullscreen`, + plugins: `autolink lists link charmap print code fullscreen image link media table paste hr wordcount`, + toolbar: `code | undo redo | removeformat | bold italic strikethrough | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media table | fontselect fontsizeselect | blockquote hr charmap | print fullscreen`, media_alt_source: false, media_poster: false, setup: editor => { From fc971e49022bb683bd697cab4fe4da91586f5db2 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sat, 19 Mar 2022 20:03:16 +0300 Subject: [PATCH 2/4] rivers: if points data is wrong, ignore points --- modules/ui/layers.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/ui/layers.js b/modules/ui/layers.js index 653cc9e4..009828c4 100644 --- a/modules/ui/layers.js +++ b/modules/ui/layers.js @@ -1481,6 +1481,12 @@ function drawRivers() { const riverPaths = pack.rivers.map(({cells, points, i, widthFactor, sourceWidth}) => { if (!cells || cells.length < 2) return; + + if (points && points.length !== cells.length) { + console.error(`River ${i} has ${cells.length} cells, but only ${points.length} points defined. Resetting points data`); + points = undefined; + } + const meanderedPoints = addMeandering(cells, points); const path = getRiverPath(meanderedPoints, widthFactor, sourceWidth); return ``; From 8473b9ed01aa51564b21dc46d1278c01402e6994 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Sat, 19 Mar 2022 20:04:06 +0300 Subject: [PATCH 3/4] update supporters --- modules/ui/options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui/options.js b/modules/ui/options.js index eef2cd09..ad90d7fe 100644 --- a/modules/ui/options.js +++ b/modules/ui/options.js @@ -105,7 +105,7 @@ function showSupporters() { Jonathan Williams,ojacid .,Brian Wilson,A Patreon of the Ahts,Shubham Jakhotiya,www15o,Jan Bundesmann,Angelique Badger,Joshua Xiong,Moist mongol, Frank Fewkes,jason baldrick,Game Master Pro,Andrew Kircher,Preston Mitchell,Chris Kohut,Emarandzeb,Trentin Bergeron,Damon Gallaty,Pleaseworkforonce, Jordan,William Markus,Sidr Dim,Alexander Whittaker,The Next Level,Patrick Valverde,Markus Peham,Daniel Cooper,the Beagles of Neorbus,Marley Moule, - Maximilian Schielke,Johnathan Xavier Hutchinson,Ele,Rita`; + Maximilian Schielke,Johnathan Xavier Hutchinson,Ele,Rita,Randy Ross,John Wick,RedSpaz,cameron cannon,Ian Grau-Fay,Kyle Barrett,Charlotte Wiland`; const array = supporters .replace(/(?:\r\n|\r|\n)/g, "") From 79b7df1c95f9c8666bacbbb879cd8e9165f682e3 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Tue, 22 Mar 2022 00:14:15 +0300 Subject: [PATCH 4/4] not allow to select text on svg --- index.css | 1 + 1 file changed, 1 insertion(+) diff --git a/index.css b/index.css index ed81773f..c8d5efb0 100644 --- a/index.css +++ b/index.css @@ -50,6 +50,7 @@ iframe { mask-mode: alpha; mask-clip: no-clip; fill-rule: evenodd; + user-select: none; } #canvas {