11.1.2 release

Former-commit-id: cc67afb105f0473c42a3e8d1777d6f6f36e4577e

ChangeLog

@@ -1,3 +1,8 @@
+05-AUG-2019: 11.1.2
+
+- Fixes encoding of embedded PNG data
+- Ads custom Gitlab URL option
+
 02-AUG-2019: 11.1.1
 
 - Forces in-place electron users to upgrade page

VERSION

@@ -1 +1 @@
-11.1.1
+11.1.2

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 08/02/2019 03:00 PM
+# 08/05/2019 05:45 PM
 
 app.html
 index.html?offline=1

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

@@ -1,7 +1,8 @@
 /**
- * Copyright (c) 2006-2018, JGraph Ltd
- * Copyright (c) 2006-2018, Gaudenz Alder
+ * Copyright (c) 2006-2019, JGraph Ltd
+ * Copyright (c) 2006-2019, draw.io AG
  */
+
 /**
  * Constructs a new point for the optional x and y coordinates. If no
  * coordinates are given, then the default values for <x> and <y> are used.
@@ -2302,7 +2303,7 @@ App.prototype.appIconClicked = function(evt)
 			}
 			else
 			{
-				this.openLink('https://gitlab.com/');
+				this.openLink(DRAWIO_GITLAB_URL);
 			}
 		}
 		else if (mode == App.MODE_DEVICE)

src/main/webapp/js/diagramly/Dialogs.js

@@ -1,7 +1,8 @@
 /**
- * Copyright (c) 2006-2018, JGraph Ltd
- * Copyright (c) 2006-2018, Gaudenz Alder
+ * Copyright (c) 2006-2019, JGraph Ltd
+ * Copyright (c) 2006-2019, draw.io AG
  */
+
 var StorageDialog = function(editorUi, fn, rowLimit)
 {
 	rowLimit = (rowLimit != null) ? rowLimit : 2;
@@ -822,7 +823,7 @@ var SplashDialog = function(editorUi)
 			addLogout(function()
 			{
 				editorUi.gitLab.logout();
-				editorUi.openLink('https://gitlab.com/users/sign_out');
+				editorUi.openLink(DRAWIO_GITLAB_URL + '/users/sign_out');
 			});
 		}
 		else if (editorUi.mode == App.MODE_TRELLO && editorUi.trello != null)
@@ -5040,7 +5041,7 @@ var LinkDialog = function(editorUi, initialValue, btnLabel, fn, showPages)
 					var ref = tokens[2];
 					var path = tokens.slice(3, tokens.length).join('/');
 
-					linkInput.value = 'https://gitlab.com/' + org + '/' +
+					linkInput.value = DRAWIO_GITLAB_URL + '/' + org + '/' +
 						repo + '/blob/' + ref + '/' + path;
 					linkInput.focus();
 				}

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

@@ -3832,7 +3832,7 @@
    	    
    	    if (xml != null)
    	    {
-   	    	data = this.writeGraphModelToPng(data, 'tEXt', 'mxfile', xml);
+   	    	data = this.writeGraphModelToPng(data, 'tEXt', 'mxfile', encodeURIComponent(xml));
    	    }
    	    
    	    return data;
@@ -5908,7 +5908,7 @@
 		   			
 		   	   	    var data = canvas.toDataURL('image/png');
 		   	   	    data = this.writeGraphModelToPng(data,
-		   	   	    	'tEXt', 'mxfile', diagramData);
+		   	   	    	'tEXt', 'mxfile', encodeURIComponent(diagramData));
 	   	   	   		success(data.substring(data.lastIndexOf(',') + 1));
 	
 					// Removes temporary graph from DOM
@@ -10510,8 +10510,8 @@
 								
 						   	    if (data.format == 'xmlpng')
 						   	    {
-						   	    	uri = this.writeGraphModelToPng(uri, 'zTXt', 'mxGraphModel',
-						   	    		atob(Graph.compress(xml)));	
+						   	    	uri = this.writeGraphModelToPng(uri, 'tEXt', 'mxfile',
+						   	    		encodeURIComponent(xml));
 						   	    }
 						   	    	
 								// Removes temporary graph from DOM

src/main/webapp/js/diagramly/GitLabClient.js

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2006-2017, JGraph Ltd
- * Copyright (c) 2006-2017, Gaudenz Alder
+ * Copyright (c) 2006-2019, JGraph Ltd
+ * Copyright (c) 2006-2019, draw.io AG
  */
 GitLabClient = function(editorUi)
 {
@@ -23,7 +23,7 @@ GitLabClient.prototype.scope = 'api%20read_repository%20write_repository';
 /**
  * Base URL for API calls.
  */
-GitLabClient.prototype.baseUrl = 'https://gitlab.com/api/v4';
+GitLabClient.prototype.baseUrl = DRAWIO_GITLAB_URL + '/api/v4';
 
 /**
  * Authorizes the client, gets the userId and calls <open>.
@@ -40,7 +40,7 @@ GitLabClient.prototype.authenticate = function(success, error)
 			{
 				var state = '123';
 				var redirectUri = encodeURIComponent(window.location.origin + '/gitlab.html');
-				var win = window.open('https://gitlab.com/oauth/authorize?client_id=' +
+				var win = window.open(DRAWIO_GITLAB_URL + '/oauth/authorize?client_id=' +
 					this.clientId + '&scope=' + this.scope + '&redirect_uri=' + redirectUri +
 					'&response_type=token&state=' + state, 'gitlabauth');
 				
@@ -353,7 +353,7 @@ GitLabClient.prototype.getFile = function(path, success, error, asLibrary, check
  */
 GitLabClient.prototype.createGitLabFile = function(org, repo, ref, data, asLibrary, refPos)
 {
-	var gitLabUrl = 'https://gitlab.com/';
+	var gitLabUrl = DRAWIO_GITLAB_URL + '/';
 	var htmlUrl = gitLabUrl + org + '/' + repo + '/blob/' + ref + '/' + data.file_path;
 	var downloadUrl = gitLabUrl + org + '/' + repo + '/raw/' + ref + '/' + data.file_path + '?inline=false';
 	var fileName = data.file_name;
@@ -430,7 +430,7 @@ GitLabClient.prototype.insertFile = function(filename, data, success, error, asL
 				// Does not insert file here as there is another writeFile implicit via fileCreated
 				if (!asLibrary)
 				{
-					var gitLabUrl = 'https://gitlab.com/';
+					var gitLabUrl = DRAWIO_GITLAB_URL + '/';
 					var htmlUrl = gitLabUrl + org + '/' + repo + '/blob/' + ref + '/' + path;
 					var downloadUrl = gitLabUrl + org + '/' + repo + '/raw/' + ref + '/' + path + '?inline=false';
 					

src/main/webapp/js/diagramly/Init.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2006-2019, JGraph Ltd
+ * Copyright (c) 2006-2019, draw.io AG
+ */
+
 // urlParams is null when used for embedding
 window.urlParams = window.urlParams || {};
 
@@ -16,6 +21,7 @@ window.PLANT_URL = window.PLANT_URL || 'https://exp-plant.draw.io/plantuml4';
 window.DRAW_MATH_URL = window.DRAW_MATH_URL || 'https://www.draw.io/math';
 window.VSD_CONVERT_URL = window.VSD_CONVERT_URL || "https://convert.draw.io/VsdConverter/api/converter";
 window.EMF_CONVERT_URL = window.EMF_CONVERT_URL || "https://convert.draw.io/emf2png/convertEMF";
+window.DRAWIO_GITLAB_URL = window.DRAWIO_GITLAB_URL || "https://gitlab.com";
 window.SAVE_URL = window.SAVE_URL || 'save';
 window.OPEN_URL = window.OPEN_URL || 'open';
 window.PROXY_URL = window.PROXY_URL || 'proxy';
@@ -257,6 +263,21 @@ function setCurrentXml(data, filename)
 		EXPORT_URL = ex;
 	}
 
+	// Customizes gitlab URL
+	var glUrl = urlParams['gitlab'];
+
+	if (glUrl != null)
+	{
+		glUrl = decodeURIComponent(glUrl);
+		
+		if (glUrl.substring(0, 7) != 'http://' &&  glUrl.substring(0, 8) != 'https://')
+		{
+			glUrl = 'http://' + glUrl;
+		}
+		
+		DRAWIO_GITLAB_URL = glUrl;
+	}
+
 	// URL for logging
 	window.DRAWIO_LOG_URL = window.DRAWIO_LOG_URL || '';
 

src/main/webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draw.io",
-  "version": "11.1.1",
+  "version": "10.8.0",
   "description": "draw.io desktop",
   "main": "electron.js",
   "scripts": {
@@ -34,4 +34,4 @@
   "devDependencies": {
     "electron": "^6.0.0"
   }
-}
+}

src/main/webapp/resources/dia_nl.txt

@@ -52,7 +52,7 @@ attachments=Bijlagen
 aws=AWS
 aws3d=AWS 3D
 azure=Azure
-back=Back
+back=Terug
 background=Achtergrond
 backgroundColor=Achtergrondkleur
 backgroundImage=Achtergrondafbeelding
@@ -130,7 +130,7 @@ containsValidationErrors=Bevat validatiefouten
 copiedToClipboard=Gekopieerd naar klembord
 copy=Kopiëren
 copyConnect=Kopiëren bij verbinding
-copyCreated=A copy of the file was created.
+copyCreated=Een kopie van het bestand is aangemaakt.
 copyOf=Kopie van {1}
 copyOfDrawing=Kopie van tekening
 copySize=Afmetingen kopiëren
@@ -272,9 +272,9 @@ fileNotFoundOrDenied=Bestand niet gevonden. Het bestaat niet of u heeft geen rec
 fileNotLoaded=Bestand niet geladen
 fileNotSaved=Bestand niet opgeslagen
 fileOpenLocation=Hoe wilt u dit/deze bestand(en) openen?
-filetypeHtml=.html causes file to save as HTML with redirect to cloud URL
-filetypePng=.png causes file to save as PNG with embedded data
-filetypeSvg=.svg causes file to save as SVG with embedded data
+filetypeHtml=.html slaat het bestand op als HTML met verwijzing naar een URL
+filetypePng=.png slaat het bestand op als PNG met ingebedde data
+filetypeSvg=.svg slaat het bestand op als SVG met ingebedde data
 fileWillBeSavedInAppFolder={1} zal in de appfolder worden opgeslagen.
 fill=Vullen
 fillColor=Vulkleur
@@ -315,10 +315,10 @@ formatHtmlEmbedded=HTML
 formatSvgEmbedded=SVG (met XML)
 formatVsdx=VSDX
 formatVssx=VSSX
-formatXmlPlain=XML (eenvoudig)
+formatXmlPlain=XML (basis)
 formatXml=XML
 forum=Discussie-/Helpforums
-freehand=Freehand
+freehand=Vrije hand
 fromTemplate=Van sjabloon
 fromTemplateUrl=Van sjabloon-URL
 fromText=Van tekst
@@ -332,12 +332,12 @@ github=GitHub
 gitlab=GitLab
 gliffy=Gliffy
 global=Globaal
-googleDocs=Google Docs
+googleDocs=Google Documenten
 googleDrive=Google Drive
 googleGadget=Google Gadget
 googlePlus=Google+
-googleSharingNotAvailable=Sharing is only available via Google Drive. Please click Open below and share from the more actions menu:
-googleSlides=Google Slides
+googleSharingNotAvailable=Delen is alleen beschikbaar via Google Drive. Klik hieronder op Openen, Meer acties, Delen:
+googleSlides=Google Dia's
 googleSites=Google Sites
 gradient=Gradiënt
 gradientColor=Kleur
@@ -470,7 +470,7 @@ new=Nieuw
 newLibrary=Nieuwe bibliotheek
 nextPage=Volgende pagina
 no=Nee
-noPickFolder=No, pick folder
+noPickFolder=Nee, kies een map
 noAttachments=Geen bijlagen gevonden
 noColor=Geen kleur
 noFiles=Geen bestanden
@@ -666,11 +666,11 @@ space=Ruimte
 spacing=Afstand
 specialLink=Speciale Link
 standard=Standaard
-startDrawing=Start drawing
-stopDrawing=Stop drawing
+startDrawing=Start tekenen
+stopDrawing=Stop met tekenen
 starting=Opstarten
 straight=Recht
-strikethrough=Strikethrough
+strikethrough=Doorgehaald
 strokeColor=Lijnkleur
 style=Stijl
 subscript=Subscript
@@ -694,7 +694,7 @@ title=Titel
 to=tot
 toBack=Naar achteren
 toFront=Naar voren
-toolbar=Toolbar
+toolbar=Gereedschapsbalk
 tooltips=Tooltips
 top=Boven
 topAlign=Boven uitlijnen
@@ -732,7 +732,7 @@ vertical=Verticaal
 verticalFlow=Verticale stroom
 verticalTree=Verticale boom
 view=Bekijken
-viewerSettings=Viewer Settings
+viewerSettings=Weergave-instellingen
 viewUrl=Link om te bekijken: {1}
 voiceAssistant=Spraakassistent (beta)
 warning=Waarschuwing
@@ -763,19 +763,19 @@ venndiagrams=Venn Diagrammen
 webEmailOrOther=Web, e-mail of een ander internetadres
 webLink=Weblink
 wireframes=Draadmodellen
-property=Property
-value=Value
-showMore=Show More
-showLess=Show Less
-myDiagrams=My Diagrams
-allDiagrams=All Diagrams
-recentlyUsed=Recently used
-listView=List view
-gridView=Grid view
-resultsFor=Results for '{1}'
-oneDriveCharsNotAllowed=The following characters are not allowed: ~ " # %  * : < > ? / \ { | }
-oneDriveInvalidDeviceName=The specified device name is invalid
-officeNotLoggedOD=You are not logged in to OneDrive. Please open draw.io task pane and login first.
+property=Eigenschap
+value=Waarde
+showMore=Meer tonen
+showLess=Minder tonen
+myDiagrams=Mijn Diagrammen
+allDiagrams=Alle Diagrammen
+recentlyUsed=Onlangs gebruikt
+listView=Lijstweergave
+gridView=Rasterweergave
+resultsFor=Resultaten voor '{1}'
+oneDriveCharsNotAllowed=De volgende tekens zijn niet toegestaan: ~ "#% *: <>? / \ {|}
+oneDriveInvalidDeviceName=De opgegeven apparaatnaam is ongeldig
+officeNotLoggedOD=U bent niet aangemeld bij OneDrive. Open het Draw.io taakvenster en log eerst in.
 officeSelectSingleDiag=Please select a single draw.io diagram only without other contents.
 officeSelectDiag=Please select a draw.io diagram.
 officeCannotFindDiagram=Cannot find a draw.io diagram in the selection