Merge pull request #630 from parallaxinc/develop

Release 1.5.11

Author: zfi

package-lock.json

@@ -532,6 +532,7 @@ Blockly.propc.control_repeat_for_loop = function() {
 };
 
 /**
+ * Return from function call block
  *
  * @type {{
  *  init: Blockly.Blocks.controls_return.init,
@@ -555,7 +556,7 @@ Blockly.Blocks.controls_return = {
  * @return {string}
  */
 Blockly.propc.controls_return = function() {
-  return 'return;';
+  return 'return;\n';
 };
 
 /**

src/modules/blockly/generators/propc/control.js

@@ -31,6 +31,9 @@ import Blockly from 'blockly/core';
 import {getDefaultProfile} from '../../../project';
 import {colorPalette} from '../propc';
 
+const leftDblQuoteMark = '\u201C';
+const rightDblQuoteMark = '\u201D';
+
 /**
  *  Block for defining a procedure with no return value.
  *    Procedures DefNoReturn
@@ -436,7 +439,8 @@ Blockly.Blocks['procedures_defnoreturn'] = {
 };
 
 /**
- * Procedure Call No Return
+ * Block Run Function
+ * Procedure Call block that has no return value
  *
  * @type {{
  *    init: Blockly.Blocks.procedures_callnoreturn.init,
@@ -462,42 +466,67 @@ Blockly.Blocks['procedures_callnoreturn'] = {
    * @this Blockly.Block
    */
   init: function() {
+    // Look into the current profile
     const profile = getDefaultProfile();
-    if (profile.description === 'Scribbler Robot') {
-      this.setHelpUrl(Blockly.MSG_S3_FUNCTIONS_HELPURL);
-    } else {
-      this.setHelpUrl(Blockly.MSG_FUNCTIONS_HELPURL);
-    }
+    this.setHelpUrl( (profile.name === 's3') ?
+        Blockly.MSG_S3_FUNCTIONS_HELPURL:Blockly.MSG_FUNCTIONS_HELPURL);
     this.setTooltip(Blockly.MSG_PROCEDURES_CALLNORETURN_TOOLTIP);
     this.setColour(colorPalette.getColor('functions'));
+
     this.appendDummyInput('TOPROW')
-        .appendField('run function  \u201C' + this.id + '\u201D', 'NAME');
+        .appendField(
+            `run function ${leftDblQuoteMark}${this.id}${rightDblQuoteMark}`,
+            'NAME');
+
     this.setPreviousStatement(true);
     this.setNextStatement(true);
+
+    /**
+     * Function parameters array
+     * @type {*[]}
+     * @private
+     */
     this.arguments_ = [];
+
+    /**
+     * Function parameter data types
+     * @type {*[]}
+     * @private
+     */
     this.argumentVarModels_ = [];
+
+    /**
+     * No idea what a quark connection is or what it does
+     * @type {{}}
+     * @private
+     */
     this.quarkConnections_ = {};
+
+    /**
+     * More quarkness but now with ID fields
+     * @type {null}
+     * @private
+     */
     this.quarkIds_ = null;
 
     /**
      * Set the previous disabled state to false (off)
-     *
      * @type {boolean}
      * @private
      */
     this.previousDisabledState_ = false;
   },
 
   /**
-   * Returns the name of the procedure this block calls.
+   * Returns the name of the function block that this block calls.
    * @return {string} Procedure name.
    * @this Blockly.Block
+   * @description The NAME field is guaranteed to exist, null will never be returned.
    */
   getProcedureCall: function() {
-    // The NAME field is guaranteed to exist, null will never be returned.
-    return /** @type {string} */ (
-      (this.getFieldValue('NAME'))
-          .split('\u201C'))[1].slice(0, -1);
+    return /** @type {string} */ ((this.getFieldValue('NAME'))
+        .split(leftDblQuoteMark))[1]
+        .slice(0, -1);
   },
 
   /**
@@ -509,7 +538,9 @@ Blockly.Blocks['procedures_callnoreturn'] = {
    */
   renameProcedure: function(oldName, newName) {
     if (Blockly.Names.equals(oldName, this.getProcedureCall())) {
-      this.setFieldValue('run function \u201C' + newName + '\u201D', 'NAME');
+      this.setFieldValue(
+          `run function ${leftDblQuoteMark}${newName}${rightDblQuoteMark}`,
+          'NAME');
     }
   },
 
@@ -533,8 +564,10 @@ Blockly.Blocks['procedures_callnoreturn'] = {
     //     Existing param IDs.
     // Note that quarkConnections_ may include IDs that no longer exist, but
     // which might reappear if a param is reattached in the mutator.
-    const defBlock = Blockly.Procedures.getDefinition(this.getProcedureCall(),
+    const defBlock = Blockly.Procedures.getDefinition(
+        this.getProcedureCall(),
         this.workspace);
+
     const mutatorOpen = defBlock && defBlock.mutator &&
         defBlock.mutator.isVisible();
     if (!mutatorOpen) {
@@ -547,12 +580,12 @@ Blockly.Blocks['procedures_callnoreturn'] = {
     }
     // Test arguments (arrays of strings) for changes. '\n' is not a valid
     // argument name character, so it is a valid delimiter here.
-    if (paramNames.join('\n') == this.arguments_.join('\n')) {
+    if (paramNames.join('\n') === this.arguments_.join('\n')) {
       // No change.
       this.quarkIds_ = paramIds;
       return;
     }
-    if (paramIds.length != paramNames.length) {
+    if (paramIds.length !== paramNames.length) {
       throw new RangeError('paramNames and paramIds must be the same length.');
     }
     this.setCollapsed(false);
@@ -712,50 +745,73 @@ Blockly.Blocks['procedures_callnoreturn'] = {
    * @this Blockly.Block
    */
   onchange: function(event) {
+    console.log(`Event: ${event.type}`);
+
+    if (event.type === Blockly.Events.BLOCK_MOVE) {
+      try {
+        console.log(`Block is moving`);
+      } catch (err) {
+        console.log(`Block move error: ${err.message}`);
+      }
+    }
+
+    // Get the block attached to the top of this block
     const tBlock = this.previousConnection.targetBlock();
-    if (tBlock) {
-      if (tBlock.toString().indexOf('new processor ') === 0) {
-        // Solo-497
-        // Cannot set nextStatement to false if there is a block attached
-        // below the current block. Detach the block first.
-        const nextBlock = this.getNextBlock();
-        if (nextBlock !== null) {
-          console.log(`NextBlock: ${nextBlock.type.toString()}`);
-          // nextBlock.nextConnection.disconnect();
-        }
-        try {
-          this.setNextStatement(false);
-        } catch (event) {
-          console.log(event.message);
-          this.nextConnection.disconnect();
+
+    try {
+    // If a block is attached, and it is a new processor block, disconnect
+    // the block attached to the bottom of this block, if one is attached.
+    // The new processor block supports a single function call and that
+    // function call cannot chain to any other blocks.
+      if (tBlock) {
+        if (tBlock.toString().indexOf('new processor ') === 0) {
+          // Solo-497
+          // Cannot set nextStatement to false if there is a block attached
+          // below the current block. Detach the block first.
+          const nextBlock = this.getNextBlock();
+          console.log(`RunFunction: Bottom block attachment is: ${nextBlock}`);
+
+          if (nextBlock !== null) {
+            console.log(`NextBlock: ${nextBlock.type.toString()}`);
+            this.nextConnection.disconnect();
+          }
           this.setNextStatement(false);
+        } else {
+          this.setNextStatement(true);
         }
       } else {
         this.setNextStatement(true);
       }
-    } else {
-      this.setNextStatement(true);
+    } catch (event) {
+      console.log(event.message);
+      this.nextConnection.disconnect();
+      this.setNextStatement(false);
     }
+
     if (!this.workspace || this.workspace.isFlyout) {
       // Block is deleted or is in a flyout.
       return;
     }
+
     if (!event.recordUndo) {
       // Events not generated by user. Skip handling.
       return;
     }
-    if (event.type == Blockly.Events.BLOCK_CREATE &&
-        event.ids.indexOf(this.id) != -1) {
+
+    if (event.type === Blockly.Events.BLOCK_CREATE &&
+        event.ids.indexOf(this.id) !== -1) {
       // Look for the case where a procedure call was created (usually through
       // paste) and there is no matching definition.  In this case, create
       // an empty definition block with the correct signature.
       const name = this.getProcedureCall();
       let def = Blockly.Procedures.getDefinition(name, this.workspace);
-      if (def && (def.type != this.defType_ ||
-          JSON.stringify(def.arguments_) != JSON.stringify(this.arguments_))) {
+      if (def &&
+          (def.type !== this.defType_ ||
+          JSON.stringify(def.arguments_) !== JSON.stringify(this.arguments_))) {
         // The signatures don't match.
         def = null;
       }
+
       if (!def) {
         Blockly.Events.setGroup(event.group);
         /**
@@ -787,7 +843,7 @@ Blockly.Blocks['procedures_callnoreturn'] = {
         Blockly.Xml.domToWorkspace(xml, this.workspace);
         Blockly.Events.setGroup(false);
       }
-    } else if (event.type == Blockly.Events.BLOCK_DELETE) {
+    } else if (event.type === Blockly.Events.BLOCK_DELETE) {
       // Look for the case where a procedure definition has been deleted,
       // leaving this block (a procedure call) orphaned.  In this case, delete
       // the orphan.
@@ -798,11 +854,11 @@ Blockly.Blocks['procedures_callnoreturn'] = {
         this.dispose(true, false);
         Blockly.Events.setGroup(false);
       }
-    } else if (event.type == Blockly.Events.CHANGE &&
-               event.element == 'disabled') {
+    } else if (event.type === Blockly.Events.CHANGE &&
+               event.element === 'disabled') {
       const name = this.getProcedureCall();
       const def = Blockly.Procedures.getDefinition(name, this.workspace);
-      if (def && def.id == event.blockId) {
+      if (def && def.id === event.blockId) {
         // in most cases the old group should be ''
         const oldGroup = Blockly.Events.getGroup();
         if (oldGroup) {
@@ -900,8 +956,11 @@ Blockly.propc.procedures_defnoreturn = Blockly.propc.procedures_defreturn;
 Blockly.propc.procedures_callreturn = function() {
   // Call a procedure with a return value.
   const funcName = Blockly.propc.variableDB_.getName(
-      ((this.getFieldValue('NAME')).split('\u201C'))[1].slice(0, -1),
-      Blockly.Procedures.NAME_TYPE);
+      ((this.getFieldValue('NAME'))
+          .split(leftDblQuoteMark))[1]
+          .slice(0, -1),
+      // Blockly.Procedures.NAME_TYPE);
+      Blockly.PROCEDURE_CATEGORY_NAME);
   const args = [];
   for (let x = 0; x < this.arguments_.length; x++) {
     args[x] = Blockly.propc.valueToCode(this, 'ARG' + x,

src/modules/blockly/generators/propc/procedures.js

@@ -52,7 +52,8 @@ PageTextLabels['client_update_danger'] =
 PageTextLabels['editor_edit-details'] = 'Edit Project Details';
 PageTextLabels['menu_help_reference'] = 'Help & Reference';
 PageTextLabels['menu_download_simpleide'] = 'Download SimpleIDE files';
-PageTextLabels['editor_upload'] = 'Import Project';
+PageTextLabels['editor_open_project_title'] = 'Open Project';
+PageTextLabels['editor_upload'] = 'Import project';
 PageTextLabels['editor_run_configure'] = 'Configure client';
 PageTextLabels['editor_about_solo'] = 'About Solo';
 PageTextLabels['editor_license'] = 'License';
@@ -64,7 +65,7 @@ PageTextLabels['editor_client_available'] = '<strong>Select the correct port,</s
 PageTextLabels['editor_client_available_short'] = '<strong>Select the correct port,</strong> then click <svg xmlns="http://www.w3.org/2000/svg" width="14" height="15" style="vertical-align: middle;"><path d="M4.4,0 L6.8,0 6.8,4.8 10,4.8 5.6,9.2 1.2,4.8 4.4,4.8 Z M0.4,9.6 L10.8,9.6 10.8,11.6 0.4,11.6 Z" style="stroke:#000;stroke-width:1;fill:#000;"/></svg>.';
 PageTextLabels['editor_client_not-available'] = 'Unable to contact the BlocklyProp Launcher. Click for more information.';
 PageTextLabels['editor_client_title'] = 'BlocklyProp Launcher';
-PageTextLabels['editor_import'] = 'Import project file';
+PageTextLabels['editor_import'] = 'Import Project';
 PageTextLabels['editor_append'] = 'Append project file';
 PageTextLabels['editor_view_xml'] = 'XML';
 PageTextLabels['editor_new_button'] = 'New';

src/modules/blockly/language/en/page_text_labels.js

@@ -125,7 +125,7 @@ export const findClient = function() {
     logConsoleMessage('Connecting to BP Launcher client');
     establishBPLauncherConnection();
   }
-}
+};
 
 /**
  * Checks for and, if found, uses a newer WebSockets-only client

src/modules/client_connection.js

@@ -44,8 +44,19 @@ export const EnableSentry = true;
  *     {b#} is the beta release number.
  *     {rc#} is the release candidate number.
  */
-export const APP_VERSION = '1.5.10';
-export const APP_BUILD = '213';
+export const APP_VERSION = '1.5.11';
+
+/**
+ * Incremental build number. This gets updated before any release
+ * to QA or production.
+ * @type {string}
+ */
+export const APP_BUILD = '217';
+
+/**
+ * Development build stage designator
+ * @type {string}
+ */
 export const APP_QA = 'release';
 
 /**