Fixed Google Drive integration issues.

There are still some remaining issues.

Author: MarkusBordihn

package-lock.json

@@ -27,7 +27,7 @@
     "markdownlint-cli": "^0.8.1",
     "mv": "^2.1.1",
     "nw": "^0.31.5",
-    "nw-builder": "^3.5.6",
+    "nw-builder": "^3.5.7",
     "replace-in-file": "^3.4.3",
     "rimraf": "^2.6.3"
   },

package.json

@@ -519,7 +519,6 @@ cwc.fileFormat.File.prototype.loadJSON = function(data) {
  * @return {!Object}
  */
 cwc.fileFormat.File.prototype.toJSON = function() {
-  console.log(cwc.fileFormat.File.toJSON(this));
   return cwc.fileFormat.File.toJSON(this);
 };
 

src/file_format/file_format.js

@@ -62,7 +62,6 @@ cwc.fileHandler.FileSaver = function(helper) {
  * @export
  */
 cwc.fileHandler.FileSaver.prototype.saveFile = function(autoDetect = false) {
-  this.log_.info('saveFile...');
   this.prepareContent();
   if (autoDetect && this.gDriveId) {
     this.saveGDriveFile(true);
@@ -78,7 +77,6 @@ cwc.fileHandler.FileSaver.prototype.saveFile = function(autoDetect = false) {
  * @export
  */
 cwc.fileHandler.FileSaver.prototype.saveFileAs = function() {
-  this.log_.info('saveFileAs...');
   this.prepareContent();
   this.selectFileToSave(this.filename, this.fileData);
 };
@@ -90,7 +88,7 @@ cwc.fileHandler.FileSaver.prototype.saveFileAs = function() {
  * @export
  */
 cwc.fileHandler.FileSaver.prototype.saveGDriveFile = function(save_file) {
-  this.log_.info('Save file in Google Drive', this.gDriveId);
+  this.log_.info('Save file', this.filename, 'in Google Drive', this.gDriveId);
   let gDriveInstance = this.helper.getInstance('gapi').getDrive();
   this.prepareContent();
   if (save_file) {
@@ -105,7 +103,7 @@ cwc.fileHandler.FileSaver.prototype.saveGDriveFile = function(save_file) {
  * @export
  */
 cwc.fileHandler.FileSaver.prototype.saveGCloudFile = function() {
-  this.log_.info('Save file in Google Cloud');
+  this.log_.info('Save file', this.filename, 'in Google Cloud');
   let gCloudInstance = this.helper.getInstance('gapi').getCloud();
   this.prepareContent();
   gCloudInstance.publishDialog(this.filename, this.fileData, this.mimeType);
@@ -116,6 +114,7 @@ cwc.fileHandler.FileSaver.prototype.saveGCloudFile = function() {
  * Prepares file and ensures we have the latest editor content.
  */
 cwc.fileHandler.FileSaver.prototype.prepareContent = function() {
+  this.log_.info('Prepare Content for saving file...');
   let editorInstance = this.helper.getInstance('editor');
   let fileInstance = this.helper.getInstance('file');
   let fileTitle = fileInstance.getFileTitle();
@@ -167,10 +166,12 @@ cwc.fileHandler.FileSaver.prototype.prepareContent = function() {
  */
 cwc.fileHandler.FileSaver.prototype.addFileExtension = function(
     filename, extension = cwc.utils.mime.Type.CWC.ext[0]) {
-  if (filename.includes(extension)) {
-    return filename;
+  console.log('addFileExtension', filename);
+  if (!filename) {
+    this.log_.error('Invalid filename', filename, 'for', extension);
+    return;
   }
-  return filename + extension;
+  return filename.includes(extension) ? filename : filename + extension;
 };
 
 

src/file_handler/file_saver.js

@@ -48,6 +48,12 @@
   font-weight: bold;
 }
 
+#{$prefix}gdrive-wait {
+  margin: auto;
+  padding: 10px;
+  width: 50%
+}
+
 #{$prefix}gdrive-content {
   overflow: hidden;
   height: 450px;
@@ -56,8 +62,9 @@
 #{$prefix}gdrive-file_list {
   position: relative;
   min-width: 750px;
-  height: 350px;
-  overflow: scroll;
+  height: 414px;
+  overflow-y: scroll;
+  overflow-x: auto;
 }
 
 #{$prefix}gdrive-file_list td {
@@ -80,3 +87,7 @@
   width: 16px;
   height: 16px;
 }
+
+#{$prefix}gdrive-file_list .mdl-data-table {
+  min-width: 735px;
+}