10.0.41 release

Former-commit-id: 6efa4771ffbddbd2fdf85eb3bd5af67ba08c6eac

ChangeLog

@@ -1,3 +1,11 @@
+15-JAN-2019: 10.0.41
+
+- Adds ignored page size in checksum
+
+15-JAN-2019: 10.0.40
+
+- Fixes possible use of undefined variable
+
 15-JAN-2019: 10.0.39
 
 - Fixes shadow change check

VERSION

@@ -1 +1 @@
-10.0.39
+10.0.41

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 01/15/2019 02:40 PM
+# 01/15/2019 05:34 PM
 
 app.html
 index.html?offline=1

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

@@ -477,6 +477,11 @@ App.main = function(callback, createUi)
 				// Mapping from key to URL in App.plugins
 				var t = temp.split(';');
 				
+				if (typeof window.drawDevUrl == 'undefined')
+				{
+					drawDevUrl = '';
+				}
+
 				for (var i = 0; i < t.length; i++)
 				{
 					var url = App.pluginRegistry[t[i]];
@@ -484,7 +489,15 @@ App.main = function(callback, createUi)
 					if (url != null && pluginsLoaded[url] == null)
 					{
 						pluginsLoaded[url] = true;
-						mxscript(drawDevUrl + url);
+						
+						if (typeof window.drawDevUrl === 'undefined')
+						{
+							mxscript(url);	
+						}
+						else
+						{
+							mxscript(drawDevUrl + url);
+						}
 					}
 					else if (window.console != null)
 					{

src/main/webapp/js/diagramly/DrawioFile.js

@@ -1188,7 +1188,7 @@ DrawioFile.prototype.installListeners = function()
  */
 DrawioFile.prototype.addAllSavedStatus = function(status)
 {
-	if (this.ui.statusContainer != null)
+	if (this.ui.statusContainer != null && this.ui.getCurrentFile() == this)
 	{
 		status = (status != null) ? status : mxUtils.htmlEntities(mxResources.get(this.allChangesSavedKey));
 		
@@ -1218,7 +1218,7 @@ DrawioFile.prototype.addAllSavedStatus = function(status)
  */
 DrawioFile.prototype.addUnsavedStatus = function(err)
 {
-	if (!this.inConflictState && this.ui.statusContainer != null)
+	if (!this.inConflictState && this.ui.statusContainer != null && this.ui.getCurrentFile() == this)
 	{
 		if (err instanceof Error && err.message != null && err.message != '')
 		{

src/main/webapp/js/diagramly/DrawioFileSync.js

@@ -150,7 +150,7 @@ DrawioFileSync = function(file)
  * be incremented if new messages are added or the format is changed.
  * This must be numeric to compare older vs newer protocol versions.
  */
-DrawioFileSync.PROTOCOL = 5;
+DrawioFileSync.PROTOCOL = 6;
 
 //Extends mxEventSource
 mxUtils.extend(DrawioFileSync, mxEventSource);

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

@@ -2405,14 +2405,15 @@
 			// ignore in hash and do not diff null names for now
 			diagram.removeAttribute('name');
 			
-			// Local defaults may be different in files so ignore
-			diagram.removeAttribute('pageWidth');
-			diagram.removeAttribute('pageHeight');
-			
 			// Model is only a holder for the root
 			model.root = pages[i].root;
 			var xmlNode = codec.encode(model);
 			this.editor.graph.saveViewState(pages[i].viewState, xmlNode, true);
+			
+			// Local defaults may be different in files so ignore
+			xmlNode.removeAttribute('pageWidth');
+			xmlNode.removeAttribute('pageHeight');
+			
 			diagram.appendChild(xmlNode);
 			
 			if (details != null)