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

LICENSE

@@ -1,5 +1,5 @@
                               JGraph License 2.0
-                 Based on Apache License Version 2.0, January 2004
+                  Based on Apache License Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -202,4 +202,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

VERSION

@@ -1 +1 @@
-24.7.8
+24.7.17

src/main/webapp/js/diagramly/App.js

@@ -1688,7 +1688,7 @@ App.prototype.init = function()
 						{
 							this.updateUserElement();
 							this.restoreLibraries();
-							// this.checkLicense();
+							this.checkLicense();
 						}))
 
 						// Notifies listeners of new client
@@ -1911,7 +1911,7 @@ App.blockedAncestorFrames = function()
 				message += ' -> ' + window.location.ancestorOrigins[i];
 
 				// Running commercial, competing services using our infrastructure isn't allowed.
-				if (message.endsWith('.appsplus.co') || message.endsWith('confluence-cloud-excalidraw-ll3likebca-uc.a.run.app'))
+				if (message.endsWith('dan6v7pm1f1a1.cloudfront.net') || message.endsWith('confluence-cloud-excalidraw-ll3likebca-uc.a.run.app'))
 				{
 					return true;
 				}

src/main/webapp/js/diagramly/DevTools.js

@@ -12,7 +12,7 @@ if (urlParams['dev'] == '1')
 			var tip = graphGetTooltipForCell.apply(this, arguments);
 			var geo = this.getCellGeometry(cell);
 
-			tip += ((tip.length > 0) ? '<br>' : '') + 'id=' + cell.id + '<br>';
+			tip += ((tip.length > 0) ? '<br>' : '') + 'id=' + mxUtils.htmlEntities(cell.id) + '<br>';
 
 			if (geo != null)
 			{

src/main/webapp/js/diagramly/EditorUi.js

@@ -3351,6 +3351,19 @@
 
 				if (!noDialogs)
 				{
+					if (e.fallbackFileData != null)
+					{
+						e.alternateAction = {
+							label: mxResources.get('makeCopy'),
+							funct: mxUtils.bind(this, function()
+							{
+								this.hideDialog();
+								var tempFile = new LocalFile(this, e.fallbackFileData, this.defaultFilename, true);
+								this.fileLoaded(tempFile);
+							})
+						};
+					}
+
 					this.handleError(e, mxResources.get('errorLoadingFile'), fn, true, null, null, true);
 				}
 				else
@@ -4755,6 +4768,11 @@
 					return this.openLink('mailto:' + mxUtils.htmlEntities(e.ownerEmail));
 				});
 			}
+			else if (e != null && e.alternateAction != null)
+			{
+				btn3 = e.alternateAction.label;
+				fn3 = e.alternateAction.funct;
+			}
 
 			this.showError(title, msg, btn, fn, retry, null, null, btn3, fn3,
 				null, null, null, (invokeFnOnClose) ? fn : null);
@@ -17063,6 +17081,23 @@
 							urlParams['saveAndExit'] = data.saveAndExit;
 						}
 
+						if (urlParams['saveAndExit'] == '1' ||
+							urlParams['publishClose'] == '1')
+						{
+							this.actions.get('save').shortcut = null;
+
+							if (!this.editor.chromeless || this.editor.editable)
+							{
+								this.keyHandler.bindAction(83, true, 'saveAndExit'); // Ctrl+S
+
+								if (urlParams['noSaveBtn'] != '1')
+								{
+									this.actions.get('save').shortcut = Editor.ctrlKey + '+Shift+S';
+									this.keyHandler.bindAction(83, true, 'save', true); // Ctrl+Shift+S
+								}
+							}
+						}
+
 						if (data.noSaveBtn != null && urlParams['noSaveBtn'] == null)
 						{
 							urlParams['noSaveBtn'] = data.noSaveBtn;
@@ -17495,20 +17530,21 @@
 			{
 				div.appendChild(this.createEmbedButton(urlParams['publishClose'] == '1' ?
 					mxResources.get('publish') : mxResources.get('saveAndExit'),
-					this.actions.get('saveAndExit').funct, null, true));
+					this.actions.get('saveAndExit').funct, Editor.ctrlKey + '+S', true));
 			}
 		}
 		else
 		{
 			div.appendChild(this.createEmbedButton(mxResources.get('save'), mxUtils.bind(this, function()
 			{
 				this.actions.get('save').funct(false);
-			}), Editor.ctrlKey + '+S', true));
+			}), urlParams['saveAndExit'] == '1' ? Editor.ctrlKey + '+Shift+S' :
+				Editor.ctrlKey + '+S', true));
 
 			if (urlParams['saveAndExit'] == '1')
 			{
 				div.appendChild(this.createEmbedButton(mxResources.get('saveAndExit'),
-					this.actions.get('saveAndExit').funct));
+					this.actions.get('saveAndExit').funct, Editor.ctrlKey + '+S'));
 			}
 		}
 

src/main/webapp/js/diagramly/GraphViewer.js

@@ -2380,7 +2380,7 @@ GraphViewer.blockedAncestorFrames = function()
 				message += ' -> ' + window.location.ancestorOrigins[i];
 
 				// Running commercial, competing services using our infrastructure isn't allowed.
-				if (message.endsWith('.appsplus.co') || message.endsWith('confluence-cloud-excalidraw-ll3likebca-uc.a.run.app'))
+				if (message.endsWith('dan6v7pm1f1a1.cloudfront.net') || message.endsWith('confluence-cloud-excalidraw-ll3likebca-uc.a.run.app'))
 				{
 					return true;
 				}

src/main/webapp/js/diagramly/Menus.js

@@ -2752,6 +2752,8 @@
 
 		if (urlParams['embed'] == '1')
 		{
+			editorUi.actions.get('saveAs').setEnabled(false);
+
 			editorUi.actions.get('save').funct = function(exit)
 			{
 				if (graph.isEditing())
@@ -2767,7 +2769,8 @@
 					var msg = editorUi.createLoadMessage('save');
 					msg.xml = data;
 
-					if (exit)
+					if (exit === true && (urlParams['saveAndExit'] == '1' ||
+						urlParams['publishClose'] == '1'))
 					{
 						msg.exit = true;
 					}
@@ -2804,8 +2807,7 @@
 				{
 					editorUi.actions.get('save').funct(true);
 				}
-
-			});
+			}, null, null, Editor.ctrlKey + '+S');
 
 			saveAndExitAction.label = urlParams['publishClose'] == '1' ? mxResources.get('publish') : mxResources.get('saveAndExit');
 
@@ -4103,6 +4105,14 @@
 						editorUi.showLibraryDialog(null, null, null, null, App.MODE_DEVICE);
 					}, parent);
 				}
+
+				if (urlParams['confLib'] == '1')
+				{
+					menu.addItem(mxResources.get('confluenceCloud') + '...', null, function()
+					{
+						editorUi.showLibraryDialog(null, null, null, null, 'CONF_LIB');
+					}, parent);
+				}
 			}));
 
 			this.put('openLibraryFrom', new Menu(function(menu, parent)
@@ -4234,7 +4244,7 @@
 										try
 										{
 											editorUi.loadLibrary(new UrlLibrary(
-												this, req.getText(), fileUrl));
+												editorUi, req.getText(), fileUrl));
 											editorUi.showSidebar();
 										}
 										catch (e)

src/main/webapp/js/diagramly/Pages.js

@@ -1483,13 +1483,28 @@ EditorUi.prototype.clonePages = function(pages)
 		catch (e)
 		{
 			errors.push(mxResources.get('pageWithNumber',
-				[i + 1]) + ': ' + e.message);
+				[i + 1]) + ': ' + e.toString());
 		}
 	}
 
 	if (errors.length > 0)
 	{
-		throw new Error(errors.join('\n'));
+		var error = new Error(errors.join('\n'));
+
+		// Provides error handling with XML of valid pages for fallback
+		try
+		{
+			if (result.length > 0)
+			{
+				error.fallbackFileData = this.getXmlForPages(result);
+			}
+		}
+		catch (e)
+		{
+			// ignore
+		}
+
+		throw error;
 	}
 
 	return result;