Updated dependencies and fixed integration issues.

Thanks to @PierreQuentel for fixing some Brython issues to allow a smooth integration of the latest version.
Added simple legancy support (conversion) for former block definition to avoid not loading files.
Updated feature detection for better compability when running as web app.
Fixed gapi integration to avoid errors messages with the latest integrations like classroom.
Fixed material design lite design issues with checkboxes.
Added additional automated tests.

Author: MarkusBordihn

app/chrome_app/background.js

@@ -30,7 +30,7 @@ chrome.app.runtime.onLaunched.addListener(
 
     let screenWidth = screen.availWidth;
     let screenHeight = screen.availHeight;
-    console.log('Screensize', screenWidth, 'x', screenHeight);
+    console.log('Screen-size', screenWidth, 'x', screenHeight);
     let editorWidth = 1280;
     let editorHeight = 720;
     let editorConfig = {

app/chrome_app/manifest.json

@@ -9,7 +9,7 @@
   "short_name": "Coding with Chrome",
   "description": "Learn, improve, or teach coding skills within a Chrome browser.",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSWdCJSwkgFTY9d993Quot277oCS2PCM2H/F6U28NE8D3Z21GXS/7qW8XCGShB054Wboq62pP679f9tB9F+GRHzOh/an4zIu+Uhb3ZKVzZLJbHsP8N+E5wk3wgwOBgE+UXCy9I8i1RpfzutJ4aha+YEzvCsVpo6UwsuWiXORB9yRU5NuooYX+fhVpWZmrZJo4vqzQhuoJ/uWiQujABXXo4qdrclwSw8+JlpWLMqHHQ6HE8Sf7VWDdGvRdYP6LRZobWqovb659qEumJ0bxhwXtHkWgPHQWtW35T/r/oH8uuke35pH+YtBtaOqN5U3bYGPinP0bYrI33OSLUJx/DrC1wIDAQAB",
-  "version": "5.8.16",
+  "version": "5.10.1",
   "oauth2": {
     "client_id": "418162477970-2qmsb2sp3m522hf292154favsjgpsj9n.apps.googleusercontent.com",
     "scopes": [

app/nw_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binary",
-  "version": "5.8.16",
+  "version": "5.10.1",
   "main": "js/background.js",
   "window": {
     "title": "Coding with Chrome",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coding-with-chrome",
   "description": "Coding with Chrome",
-  "version": "5.8.16",
+  "version": "5.10.1",
   "author": "Markus Bordihn ([email protected])",
   "license": "Apache-2.0",
   "private": true,

src/blocks/sphero/sphero2/blocks.js

@@ -198,17 +198,3 @@ Blockly.Blocks['sphero_sphero2_collision'] = {
     this.setTooltip(i18t('Detect collision.'));
   },
 };
-
-
-/**
- * Deprecated: Alias for former blocks for compatibility reasons.
- */
-Blockly.Blocks['sphero_start'] = Blockly.Blocks['sphero_sphero2_start'];
-Blockly.Blocks['sphero_roll'] = Blockly.Blocks['sphero_sphero2_roll'];
-Blockly.Blocks['sphero_roll_step'] = Blockly.Blocks['sphero_sphero2_roll_step'];
-Blockly.Blocks['sphero_roll_time'] = Blockly.Blocks['sphero_sphero2_roll_time'];
-Blockly.Blocks['sphero_heading'] = Blockly.Blocks['sphero_sphero2_heading'];
-Blockly.Blocks['sphero_rgb'] = Blockly.Blocks['sphero_sphero2_rgb'];
-Blockly.Blocks['sphero_backlight'] = Blockly.Blocks['sphero_sphero2_backlight'];
-Blockly.Blocks['sphero_stop'] = Blockly.Blocks['sphero_sphero2_stop'];
-Blockly.Blocks['sphero_collision'] = Blockly.Blocks['sphero_sphero2_collision'];

src/file_handler/file_loader.js

@@ -74,13 +74,32 @@ cwc.fileHandler.FileLoader.prototype.loadFile = function() {
 
 /**
  * Creates a request to load file.
- * @param {Function=} optCallback
+ * @param {Function=} callback
  */
-cwc.fileHandler.FileLoader.prototype.requestLoadFile = function(optCallback) {
+cwc.fileHandler.FileLoader.prototype.requestLoadFile = function(callback) {
   let loadFile = function() {
     this.loadFile();
-    if (optCallback) {
-      optCallback();
+    if (callback) {
+      callback();
+    }
+  }.bind(this);
+  this.helper.handleUnsavedChanges(loadFile);
+};
+
+
+/**
+ * Creates a request to load file.
+ * @param {Function=} callback
+ */
+cwc.fileHandler.FileLoader.prototype.requestLoadGoogleDriveFile = function(
+    callback) {
+  let loadFile = function() {
+    let gapiInstance = this.helper.getInstance('gapi');
+    if (gapiInstance && gapiInstance.getDrive()) {
+      gapiInstance.getDrive().openDialog();
+    }
+    if (callback) {
+      callback();
     }
   }.bind(this);
   this.helper.handleUnsavedChanges(loadFile);

src/file_handler/file_saver.js

@@ -91,7 +91,7 @@ cwc.fileHandler.FileSaver.prototype.saveFileAs = function() {
  */
 cwc.fileHandler.FileSaver.prototype.saveGDriveFile = function(save_file) {
   this.log_.info('Save file in Google Drive', this.gDriveId);
-  let gDriveInstance = this.helper.getInstance('gdrive', true);
+  let gDriveInstance = this.helper.getInstance('gapi').getDrive();
   this.prepareContent();
   if (save_file) {
     gDriveInstance.saveFile(this.filename, this.fileData, this.gDriveId);
@@ -106,7 +106,7 @@ cwc.fileHandler.FileSaver.prototype.saveGDriveFile = function(save_file) {
  */
 cwc.fileHandler.FileSaver.prototype.saveGCloudFile = function() {
   this.log_.info('Save file in Google Cloud');
-  let gCloudInstance = this.helper.getInstance('gcloud', true);
+  let gCloudInstance = this.helper.getInstance('gapi').getCloud();
   this.prepareContent();
   gCloudInstance.publishDialog(this.filename, this.fileData, this.mimeType);
 };

src/frameworks/python/python3.js

@@ -42,6 +42,5 @@ cwc.framework.Python3 = function() {
 cwc.framework.Python3.prototype.run = function() {
   brython({
     'indexedDB': this.indexedDBSupport,
-    'debug': false,
   });
 };

src/renderer/external/python/python.js

@@ -107,9 +107,8 @@ cwc.renderer.external.Python.prototype.renderPython2 = function(
   header += rendererHelper.getStyleSheetURL(
     /** @type {string} */ (cwc.config.framework.StyleSheet.DIALOG));
   let body = '<div id="content"></div>' +
-  '<script id="code" type="text/python">\n' +
-    content +
-  '\n</script>\n<script>new cwc.framework.Python2().run();</script>';
+  '<script id="code" type="text/python">\n' + content +'\n</script>\n' +
+  '<script>new cwc.framework.Python2().run();</script>';
 
   return rendererHelper.getHTML(body, header);
 };

src/ui/blockly/blockly.js

@@ -21,6 +21,7 @@ goog.provide('cwc.ui.Blockly');
 
 goog.require('cwc.soy.ui.Blockly');
 goog.require('cwc.ui.BlocklyConfig');
+goog.require('cwc.ui.BlocklyLegacy');
 goog.require('cwc.ui.BlocklyToolbar');
 goog.require('cwc.ui.BlocklyToolbox');
 goog.require('cwc.ui.Helper');
@@ -258,7 +259,8 @@ cwc.ui.Blockly.prototype.addView = function(name, xml) {
   let workspace = this.getWorkspace();
   if (workspace) {
     this.log_.info('Add view', name, '(', xml.length, ')');
-    let xmlDom = Blockly.Xml.textToDom(xml);
+    let xmlString = cwc.ui.BlocklyLegacy.parse(xml);
+    let xmlDom = Blockly.Xml.textToDom(xmlString);
     try {
       Blockly.Xml.domToWorkspace(xmlDom, workspace);
       this.resetZoom();