7.5.8 release

Former-commit-id: 64b1d03

ChangeLog

@@ -1,3 +1,13 @@
+23-OCT-2017: 7.5.8
+
+- Adds Team Drives support in GDriveConnector
+- Fixes bug in mockups sidebar
+
+22-OCT-2017: 7.5.7
+
+- Adds support for team drives in google picker
+- Removes image export after closing lightbox
+
 16-OCT-2017: 7.5.6
 
 - Adds IBM icons

VERSION

@@ -1 +1 @@
-7.5.6
+7.5.8

etc/vsdxJava2JS/.classpath

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_101"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

etc/vsdxJava2JS/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jsweet-quickstart</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

etc/vsdxJava2JS/.settings/org.jsweet.plugin.prefs

@@ -0,0 +1,8 @@
+compiler.candyJsFolder=webapp
+compiler.debugMode=ts
+compiler.javascriptFolder=target/js
+compiler.moduleKind=none
+compiler.profiles=default
+compiler.sourceFolders=
+compiler.typescriptFolder=target/ts
+eclipse.preferences.version=1

war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 10/16/2017 04:40 PM
+# 10/23/2017 08:46 AM
 
 app.html
 index.html?offline=1

war/index.html

@@ -165,6 +165,7 @@
 	<link rel="shortcut icon" href="favicon.ico">
 	<style type="text/css">
 		body { overflow:hidden; }
+		div.picker { z-index: 10007; }
 		.geSidebarContainer .geTitle { color:#505050; }
 		.geSidebarContainer .geTitle input {
 			font-size:8pt;

war/js/diagramly/App.js

@@ -517,14 +517,6 @@ App.main = function(callback, createUi)
 			}
 		}
 
-		/**
-		 * Loads Google Image Picker API (not allowed inside iframes)
-		 */
-		if (urlParams['picker'] != '0' && !mxClient.IS_QUIRKS && document.documentMode != 8)
-		{
-			mxscript(document.location.protocol + '//www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22picker%22%2C%22version%22%3A%221%22%2C%22language%22%3A%22' + mxClient.language + '%22%7D%5D%7D');
-		}
-
 		/**
 		 * Loading plugins.
 		 */
@@ -965,7 +957,7 @@ App.prototype.init = function()
 
 				if (window.DrawGapiClientCallback != null)
 				{
-					gapi.load('auth:client,drive-realtime,drive-share', mxUtils.bind(this, function(resp)
+					gapi.load(((urlParams['picker'] != '0') ? 'picker,': '') + 'auth:client,drive-realtime,drive-share', mxUtils.bind(this, function(resp)
 					{
 						// Starts the app without the Google Option if the API fails to load
 						if (gapi.drive != null && gapi.drive.realtime != null)
@@ -1967,7 +1959,7 @@ App.prototype.load = function()
 				}
 				else
 				{
-					gapi.load('auth:client,drive-realtime,drive-share', mxUtils.bind(this, function(resp)
+					gapi.load(((urlParams['picker'] != '0') ? 'picker,': '') + 'auth:client,drive-realtime,drive-share', mxUtils.bind(this, function(resp)
 					{
 						// Starts the app without the Google Option if the API fails to load
 						if (gapi.drive == null || gapi.drive.realtime == null)

war/js/diagramly/Dialogs.js

@@ -2045,7 +2045,6 @@ var BackgroundImageDialog = function(editorUi, applyFn)
 				}
 
 				editorUi.imageSearchPicker.setVisible(true);
-				editorUi.movePickersToTop();
 			});
 
 			searchBtn.className = 'geBtn';
@@ -2064,7 +2063,7 @@ var BackgroundImageDialog = function(editorUi, applyFn)
 							// Creates one picker and reuses it to avoid polluting the DOM
 							if (editorUi.photoPicker == null)
 							{
-						    	var token = gapi.auth.getToken().access_token;
+								var token = gapi.auth.getToken().access_token;
 								var picker = new google.picker.PickerBuilder()
 									.setAppId(editorUi.drive.appId)	
 									.setLocale(mxLanguage)
@@ -2080,7 +2079,6 @@ var BackgroundImageDialog = function(editorUi, applyFn)
 							}
 
 							editorUi.photoPicker.setVisible(true);
-							editorUi.movePickersToTop();
 						}));
 					}
 				});
@@ -3822,7 +3820,6 @@ var ImageDialog = function(editorUi, title, initialValue, fn, ignoreExisting, co
 			}
 
 			editorUi.imageSearchPicker.setVisible(true);
-			editorUi.movePickersToTop();
 		});
 		searchBtn.className = 'geBtn';
 		btns.appendChild(searchBtn);
@@ -3856,7 +3853,6 @@ var ImageDialog = function(editorUi, title, initialValue, fn, ignoreExisting, co
 						}
 
 						editorUi.photoPicker.setVisible(true);
-						editorUi.movePickersToTop();
 					}));
 				}
 			});
@@ -4223,20 +4219,26 @@ var LinkDialog = function(editorUi, initialValue, btnLabel, fn, showPages)
 					// Creates one picker and reuses it to avoid polluting the DOM
 					if (editorUi.linkPicker == null)
 					{
-				    	var token = gapi.auth.getToken().access_token;
+					    	var token = gapi.auth.getToken().access_token;
 						var view = new google.picker.DocsView(google.picker.ViewId.FOLDERS)
-			        		.setParent('root')
-			        		.setIncludeFolders(true)
-			        		.setSelectFolderEnabled(true);
-				    	var view2 = new google.picker.DocsView()
+				        		.setParent('root')
+				        		.setIncludeFolders(true)
+				        		.setSelectFolderEnabled(true);
+						var view2 = new google.picker.DocsView()
+							.setIncludeFolders(true)
+				            .setSelectFolderEnabled(true);
+						var view21 = new google.picker.DocsView()
 							.setIncludeFolders(true)
+							.setEnableTeamDrives(true)
 				            .setSelectFolderEnabled(true);
 						var picker = new google.picker.PickerBuilder()
 							.setAppId(editorUi.drive.appId)	
 							.setLocale(mxLanguage)
 							.setOAuthToken(token)
+							.enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
 						    .addView(view)
 							.addView(view2)
+							.addView(view21)
 							.addView(google.picker.ViewId.RECENTLY_PICKED)
 				            .addView(google.picker.ViewId.IMAGE_SEARCH)
 				            .addView(google.picker.ViewId.VIDEO_SEARCH)
@@ -4256,7 +4258,6 @@ var LinkDialog = function(editorUi, initialValue, btnLabel, fn, showPages)
 					}
 
 					editorUi.linkPicker.setVisible(true);
-					editorUi.movePickersToTop();
 				}));
 			}
 		});

war/js/diagramly/DriveClient.js

@@ -1189,11 +1189,13 @@ DriveClient.prototype.pickFile = function(fn, acceptAllFiles)
 
 				// Pseudo-hierarchical directory view, see
 				// https://groups.google.com/forum/#!topic/google-picker-api/FSFcuJe7icQ
-				var view = new google.picker.DocsView(google.picker.ViewId.FOLDERS)
-		        	.setParent('root')
-		        	.setIncludeFolders(true);
+				var view = new google.picker.DocsView()
+			        	.setParent('root')
+			        	.setIncludeFolders(true);
 
-				var view2 = new google.picker.DocsView();
+				var view2 = new google.picker.DocsView()
+					.setEnableTeamDrives(true)
+					.setIncludeFolders(true);
 
 				var view3 = new google.picker.DocsUploadView()
 					.setIncludeFolders(true);
@@ -1214,6 +1216,7 @@ DriveClient.prototype.pickFile = function(fn, acceptAllFiles)
 			        .setOAuthToken(this[name + 'Token'])
 			        .setLocale(mxLanguage)
 			        .setAppId(this.appId)
+			        .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
 			        .addView(view)
 			        .addView(view2)
 			        .addView(google.picker.ViewId.RECENTLY_PICKED)
@@ -1235,7 +1238,6 @@ DriveClient.prototype.pickFile = function(fn, acceptAllFiles)
 
 			mxEvent.addListener(document, 'click', exit);
 			this[name].setVisible(true);
-			this.ui.movePickersToTop();
 		}));
 	}
 };
@@ -1290,40 +1292,47 @@ DriveClient.prototype.pickFolder = function(fn)
 					// Pseudo-hierarchical directory view, see
 					// https://groups.google.com/forum/#!topic/google-picker-api/FSFcuJe7icQ
 					var view = new google.picker.DocsView(google.picker.ViewId.FOLDERS)
-			        	.setParent('root')
-			        	.setIncludeFolders(true)
+						.setParent('root')
+						.setIncludeFolders(true)
 						.setSelectFolderEnabled(true)
-			        	.setMimeTypes('application/vnd.google-apps.folder');
+			        		.setMimeTypes('application/vnd.google-apps.folder');
 
 					var view2 = new google.picker.DocsView()
-						.setIncludeFolders(true) 
+						.setIncludeFolders(true)
 						.setSelectFolderEnabled(true)
 						.setMimeTypes('application/vnd.google-apps.folder');
-
+
+					var view21 = new google.picker.DocsView()
+						.setIncludeFolders(true)
+						.setEnableTeamDrives(true)
+						.setSelectFolderEnabled(true)
+						.setMimeTypes('application/vnd.google-apps.folder');
+
 					this[name] = new google.picker.PickerBuilder()
 						.setSelectableMimeTypes('application/vnd.google-apps.folder')
 				        .setOAuthToken(this[name + 'Token'])
 				        .setLocale(mxLanguage)
 				        .setAppId(this.appId)
+					    .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
 				        .addView(view)
 				        .addView(view2)
+				        .addView(view21)
 				        .addView(google.picker.ViewId.RECENTLY_PICKED)
 				        .setTitle(mxResources.get('pickFolder'))
 				        .setCallback(mxUtils.bind(this, function(data)
 				        {
-				        	if (data.action == google.picker.Action.PICKED ||
-				        		data.action == google.picker.Action.CANCEL)
-				        	{
-				        		mxEvent.removeListener(document, 'click', exit);
-				        	}
-
-				        	this.folderPickerCallback(data);
+					        	if (data.action == google.picker.Action.PICKED ||
+					        		data.action == google.picker.Action.CANCEL)
+					        	{
+					        		mxEvent.removeListener(document, 'click', exit);
+					        	}
+					        	
+					        	this.folderPickerCallback(data);
 				        })).build();
 				}
 
 				mxEvent.addListener(document, 'click', exit);
 				this[name].setVisible(true);
-				this.ui.movePickersToTop();
 			}));
 		});
 
@@ -1426,42 +1435,44 @@ DriveClient.prototype.pickLibrary = function(fn)
 				// Pseudo-hierarchical directory view, see
 				// https://groups.google.com/forum/#!topic/google-picker-api/FSFcuJe7icQ
 				var view = new google.picker.DocsView(google.picker.ViewId.FOLDERS)
-		        	.setParent('root')
-		        	.setIncludeFolders(true)
+					.setParent('root')
+		        		.setIncludeFolders(true)
 					.setMimeTypes(this.libraryMimeType + ',application/xml,text/plain,application/octet-stream');
 
 				var view2 = new google.picker.DocsView()
+					.setEnableTeamDrives(true)
+					.setIncludeFolders(true)
 					.setMimeTypes(this.libraryMimeType + ',application/xml,text/plain,application/octet-stream');
-
+				
 				var view3 = new google.picker.DocsUploadView()
 					.setIncludeFolders(true);
 
 			    this.libraryPicker = new google.picker.PickerBuilder()
 			        .setOAuthToken(this.libraryPickerToken)
 			        .setLocale(mxLanguage)
 			        .setAppId(this.appId)
+			        .enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES)
 			        .addView(view)
 			        .addView(view2)
 			        .addView(google.picker.ViewId.RECENTLY_PICKED)
 			        .addView(view3)
 			        .setCallback(mxUtils.bind(this, function(data)
 			        {
-			        	if (data.action == google.picker.Action.PICKED ||
-			        		data.action == google.picker.Action.CANCEL)
-			        	{
-			        		mxEvent.removeListener(document, 'click', exit);
-			        	}
-
-			        	if (data.action == google.picker.Action.PICKED)
-			    		{
-			        		this.filePicked(data);
-			    		}
+				        	if (data.action == google.picker.Action.PICKED ||
+				        		data.action == google.picker.Action.CANCEL)
+				        	{
+				        		mxEvent.removeListener(document, 'click', exit);
+				        	}
+				        	
+				        	if (data.action == google.picker.Action.PICKED)
+				    		{
+				        		this.filePicked(data);
+				    		}
 			        })).build();
 			}
 
 			mxEvent.addListener(document, 'click', exit);
 			this.libraryPicker.setVisible(true);
-			this.ui.movePickersToTop();
 		}));
 	}
 };