Merge branch 'dev' of https://github.com/jgraph/drawio into dev

louyongjiu · Nov 30, 2023 · 3e7a7c2 · 3e7a7c2 · vercel · Nov 30, 2023
2 parents a2cfe72 + 4776522
commit 3e7a7c2
Show file tree

Hide file tree

Showing 21 changed files with 3,647 additions and 3,130 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+29-NOV-2023: 22.1.5
+
+- Fixes forwards refs for undo of replaceDiagramData
+- Adds defaultGridSize config option [DID-10031]
+- Fixes custom fonts while editing label [DID-10031]
+
 24-NOV-2023: 22.1.4
 
 - [conf cloud] Fixes diagram list editing older versions and not refreshing [DID-10113]

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-22.1.4
+22.1.5
diff --git a/src/main/mxgraph/io/mxCellCodec.js b/src/main/mxgraph/io/mxCellCodec.js
@@ -172,6 +172,12 @@ mxCodecRegistry.register(function()
 							var decoder = mxCodecRegistry.codecs[element.nodeName] || this;
 							object = decoder.decode(dec, element);
 						}
+						else if (window.console != null)
+						{
+							console.error('mxCellCodec.beforeDecode: ' +
+								this.idrefs[i] + ' ' + ref + ' not found' +
+								' for cell ' + obj.getId());
+						}
 					}
 
 					obj[attr] = object;

diff --git a/src/main/mxgraph/view/mxGraph.js b/src/main/mxgraph/view/mxGraph.js
@@ -310,6 +310,7 @@
  * (code)
  * var enc = new mxCodec(mxUtils.createXmlDocument());
  * var node = enc.encode(graph.getModel());
+ * enc.document.appendChild(node);
  * (end)
  * 
  * This will produce an XML node than can be handled using the DOM API or

diff --git a/src/main/webapp/js/app.min.js b/src/main/webapp/js/app.min.js