12.7.4 release

ChangeLog

@@ -1,3 +1,8 @@
+21-FEB-2020:12.7.4
+
+- Changes Google picker to support team drives
+- Fixes crop for imported files
+
 21-FEB-2020: 12.7.3
 
 - Fixes caching of Google fonts

VERSION

@@ -1 +1 @@
-12.7.3
+12.7.4

etc/sheetsaddon/Picker.html

@@ -58,7 +58,7 @@
 			.setIncludeFolders(true);
 		
 		var view3 = new google.picker.DocsView()
-			.setEnableTeamDrives(true)
+			.setEnableDrives(true)
 			.setIncludeFolders(true);
 
 		var view4 = new google.picker.DocsUploadView()
@@ -71,7 +71,7 @@
 		    .addView(view4)
 		    .addView(google.picker.ViewId.RECENTLY_PICKED)
 		    .enableFeature(google.picker.Feature.MULTISELECT_ENABLED)
-		    .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
+		    .enableFeature(google.picker.Feature.SUPPORT_DRIVES)
 		    .hideTitleBar()
 		    .setOAuthToken(token)
 		    .setDeveloperKey(DEVELOPER_KEY)

etc/sheetsaddon/README

@@ -0,0 +1,13 @@
+For Deployment:
+
+As david@jgraph.com use (see Tools, Script Editor):
+https://docs.google.com/spreadsheets/d/1yUT6UE9bKDJCx7Kj1VEbrEaLyigcTO_bxyRXBDlFoLU/edit
+
+Open the web app script in the script editor.
+Make the changes you wanted. Test the code to ensure it functions as intended and is bug-free.
+Click File > Manage Versions. Enter a new version description and click Save New Version. Click OK to close the dialog.
+Click Publish > Deploy as Sheets add-on. Update the Project version to the new version you just created.
+Click Update web shop draft.
+In the new window, click on Publish changes.
+
+If you get error "Sorry, unable to open the file at this time.", try Incognito mode.

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

@@ -4887,13 +4887,13 @@ var LinkDialog = function(editorUi, initialValue, btnLabel, fn, showPages)
 				            .setSelectFolderEnabled(true);
 						var view21 = new google.picker.DocsView()
 							.setIncludeFolders(true)
-							.setEnableTeamDrives(true)
+							.setEnableDrives(true)
 				            .setSelectFolderEnabled(true);
 						var picker = new google.picker.PickerBuilder()
 							.setAppId(editorUi.drive.appId)	
 							.setLocale(mxLanguage)
 							.setOAuthToken(editorUi.drive.token)
-							.enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
+							.enableFeature(google.picker.Feature.SUPPORT_DRIVES)
 						    .addView(view)
 							.addView(view2)
 							.addView(view21)

src/main/webapp/js/diagramly/DriveClient.js

@@ -37,7 +37,7 @@ DriveClient = function(editorUi)
 		this.appIndex = 1;
 	}
 	
-	this.mimeTypes = this.xmlMimeType + 'application/mxe,application/mxr,' +
+	this.mimeTypes = this.xmlMimeType + ',application/mxe,application/mxr,' +
 		'application/vnd.jgraph.mxfile.realtime,application/vnd.jgraph.mxfile.rtlegacy';
 	
 	if (urlParams['photos'] == '1')
@@ -2014,7 +2014,7 @@ DriveClient.prototype.pickFile = function(fn, acceptAllFiles)
 						.setIncludeFolders(true);
 					
 					var view3 = new google.picker.DocsView()
-						.setEnableTeamDrives(true)
+						.setEnableDrives(true)
 						.setIncludeFolders(true);
 					
 					var view4 = new google.picker.DocsUploadView()
@@ -2037,7 +2037,7 @@ DriveClient.prototype.pickFile = function(fn, acceptAllFiles)
 				        .setOAuthToken(this[name + 'Token'])
 				        .setLocale(mxLanguage)
 				        .setAppId(this.appId)
-				        .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
+				        .enableFeature(google.picker.Feature.SUPPORT_DRIVES)
 				        .addView(view)
 				        .addView(view2)
 				        .addView(view3)
@@ -2136,7 +2136,7 @@ DriveClient.prototype.pickFolder = function(fn, force)
 							
 							var view3 = new google.picker.DocsView()
 								.setIncludeFolders(true)
-								.setEnableTeamDrives(true)
+								.setEnableDrives(true)
 								.setSelectFolderEnabled(true)
 								.setMimeTypes('application/vnd.google-apps.folder');
 							
@@ -2145,7 +2145,7 @@ DriveClient.prototype.pickFolder = function(fn, force)
 						        .setOAuthToken(this[name + 'Token'])
 						        .setLocale(mxLanguage)
 						        .setAppId(this.appId)
-							    .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
+							    .enableFeature(google.picker.Feature.SUPPORT_DRIVES)
 						        .addView(view)
 						        .addView(view2)
 						        .addView(view3)
@@ -2265,7 +2265,7 @@ DriveClient.prototype.pickLibrary = function(fn)
 						.setMimeTypes(this.libraryMimeType + ',application/xml,text/plain,application/octet-stream');
 				
 					var view3 = new google.picker.DocsView()
-						.setEnableTeamDrives(true)
+						.setEnableDrives(true)
 						.setIncludeFolders(true)
 						.setMimeTypes(this.libraryMimeType + ',application/xml,text/plain,application/octet-stream');
 					
@@ -2276,7 +2276,7 @@ DriveClient.prototype.pickLibrary = function(fn)
 				        .setOAuthToken(this.libraryPickerToken)
 				        .setLocale(mxLanguage)
 				        .setAppId(this.appId)
-				        .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
+				        .enableFeature(google.picker.Feature.SUPPORT_DRIVES)
 				        .addView(view)
 				        .addView(view2)
 				        .addView(view3)

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

@@ -28,7 +28,8 @@
 	 * Switch to disable logging for mode and search terms.
 	 */
 	EditorUi.enableLogging = urlParams['stealth'] != '1' &&
-		/.*\.draw\.io$/.test(window.location.hostname) &&
+		(/.*\.draw\.io$/.test(window.location.hostname) ||
+		/.*\.diagrams\.net$/.test(window.location.hostname)) &&
 		window.location.hostname != 'support.draw.io';
 	
 	/**
@@ -8419,13 +8420,13 @@
 	EditorUi.prototype.importFiles = function(files, x, y, maxSize, fn, resultFn, filterFn, barrierFn,
 		resizeDialog, maxBytes, resampleThreshold, ignoreEmbeddedXml)
 	{
-		x = (x != null) ? x : 0;
-		y = (y != null) ? y : 0;
 		maxSize = (maxSize != null) ? maxSize : this.maxImageSize;
 		maxBytes = (maxBytes != null) ? maxBytes : this.maxImageBytes;
 		
 		var crop = x != null && y != null;
 		var resizeImages = true;
+		x = (x != null) ? x : 0;
+		y = (y != null) ? y : 0;
 		
 		// Checks if large images are imported
 		var largeImages = false;
@@ -9797,19 +9798,25 @@
 					var x = pt.x / scale - tr.x;
 					var y = pt.y / scale - tr.y;
 					
-					if (mxEvent.isAltDown(evt))
-					{
-						x = 0;
-						y = 0;
-					}
-					
 				    if (evt.dataTransfer.files.length > 0)
 				    {
+						if (mxEvent.isAltDown(evt))
+						{
+							x = null;
+							y = null;
+						}
+						
 						this.importFiles(evt.dataTransfer.files, x, y, this.maxImageSize, null, null, null, null,
 							mxEvent.isControlDown(evt), null, null, mxEvent.isShiftDown(evt));
 		    		}
 				    else
 				    {
+						if (mxEvent.isAltDown(evt))
+						{
+							x = 0;
+							y = 0;
+						}
+						
 				    	var uri = (mxUtils.indexOf(evt.dataTransfer.types, 'text/uri-list') >= 0) ?
 				    		evt.dataTransfer.getData('text/uri-list') : null;
 				    	var data = this.extractGraphModelFromEvent(evt, this.pages != null);

src/main/webapp/service-worker.js

@@ -6,7 +6,7 @@ if (workbox)
 	workbox.precaching.precacheAndRoute([
   {
     "url": "js/app.min.js",
-    "revision": "f7ed6980f25a11339aed52d0ef895a34"
+    "revision": "1b67010895bdee0fc8fd06172e36a631"
   },
   {
     "url": "js/extensions.min.js",