Filter Blockly events for blocks onchange and arduino code generation

This also fixes an issue when a UI event triggered a code generation,
which in turn updated a block in a way that caused a new UI event to fire
and repeat this process in a circle.

Author: carlosperate

ardublockly/ardublockly.js

@@ -520,9 +520,6 @@ Ardublockly.PREV_ARDUINO_CODE_ = 'void setup() {\n\n}\n\n\nvoid loop() {\n\n}';
  * the blocks.
  */
 Ardublockly.renderContent = function() {
-  // Only regenerate the code if a block is not being dragged
-  if (Ardublockly.blocklyIsDragging()) return;
-
   // Render Arduino Code with latest change highlight and syntax highlighting
   var arduinoCode = Ardublockly.generateArduino();
   if (arduinoCode !== Ardublockly.PREV_ARDUINO_CODE_) {

ardublockly/ardublockly_blockly.js

@@ -63,8 +63,11 @@ Ardublockly.injectBlockly = function(blocklyEl, toolboxXml, blocklyPath) {
 
 /** Binds the event listeners relevant to Blockly. */
 Ardublockly.bindBlocklyEventListeners = function() {
-  Ardublockly.workspace.addChangeListener(Ardublockly.renderContent);
-
+  Ardublockly.workspace.addChangeListener(function(event) {
+    if (event.type != Blockly.Events.UI) {
+      Ardublockly.renderContent();
+    }
+  });
   // Ensure the Blockly workspace resizes accordingly
   window.addEventListener('resize',
       function() { Blockly.asyncSvgResize(Ardublockly.workspace); }, false);
@@ -78,8 +81,7 @@ Ardublockly.generateArduino = function() {
 /** @return {!string} Generated XML code from the Blockly workspace. */
 Ardublockly.generateXml = function() {
   var xmlDom = Blockly.Xml.workspaceToDom(Ardublockly.workspace);
-  var xmlText = Blockly.Xml.domToPrettyText(xmlDom);
-  return xmlText;
+  return Blockly.Xml.domToPrettyText(xmlDom);
 };
 
 /**
@@ -133,8 +135,7 @@ Ardublockly.replaceBlocksfromXml = function(blocksXml) {
 };
 
 /**
- * Parses the XML from its argument input to generate and add blocks to the
- * Blockly workspace.
+ * Parses the XML from its argument to add the blocks to the workspace.
  * @param {!string} blocksXmlDom String of XML DOM code for the blocks.
  * @return {!boolean} Indicates if the XML into blocks parse was successful.
  */

blockly/blocks/arduino/serial.js

@@ -90,12 +90,14 @@ Blockly.Blocks['serial_print'] = {
    * block if not valid data is found.
    * @this Blockly.Block
    */
-  onchange: function() {
-    if (!this.workspace) { return; }  // Block has been deleted.
+  onchange: function(event) {
+    if (!this.workspace || event.type == Blockly.Events.MOVE ||
+        event.type == Blockly.Events.UI) {
+        return;  // Block deleted or irrelevant event
+    }
 
     // Get the Serial instance from this block
     var thisInstanceName = this.getFieldValue('SERIAL_ID');
-
     // Iterate through top level blocks to find setup instance for the serial id
     var blocks = Blockly.mainWorkspace.getTopBlocks();
     var setupInstancePresent = false;
@@ -105,6 +107,7 @@ Blockly.Blocks['serial_print'] = {
         var setupBlockInstanceName = func.call(blocks[x]);
         if (thisInstanceName == setupBlockInstanceName) {
           setupInstancePresent = true;
+          break;
         }
       }
     }

blockly/blocks/arduino/spi.js

@@ -110,8 +110,11 @@ Blockly.Blocks['spi_transfer'] = {
    * block if not valid data is found.
    * @this Blockly.Block
    */
-  onchange: function() {
-    if (!this.workspace) { return; }  // Block has been deleted.
+  onchange: function(event) {
+    if (!this.workspace || event.type == Blockly.Events.MOVE ||
+        event.type == Blockly.Events.UI) {
+        return;  // Block deleted or irrelevant event
+    }
 
     // Get the Serial instance from this block
     var thisInstanceName = this.getFieldValue('SPI_ID');
@@ -130,8 +133,9 @@ Blockly.Blocks['spi_transfer'] = {
     }
 
     if (!setupInstancePresent) {
-      this.setWarningText(Blockly.Msg.ARD_SPI_TRANS_WARN1.replace('%1', thisInstanceName),
-								  'spi_setup');
+      this.setWarningText(
+          Blockly.Msg.ARD_SPI_TRANS_WARN1.replace('%1', thisInstanceName),
+          'spi_setup');
     } else {
       this.setWarningText(null, 'spi_setup');
     }
@@ -164,8 +168,8 @@ Blockly.Blocks['spi_transfer'] = {
     }
     // If the old value is not present any more, add a warning to the block.
     if (!currentValuePresent) {
-      this.setWarningText(Blockly.Msg.ARD_SPI_TRANS_WARN2.replace('%1', fieldValue),
-			  'bPin');
+      this.setWarningText(
+          Blockly.Msg.ARD_SPI_TRANS_WARN2.replace('%1', fieldValue), 'bPin');
     } else {
       this.setWarningText(null, 'bPin');
     }

blockly/blocks/arduino/stepper.js

@@ -161,8 +161,11 @@ Blockly.Blocks['stepper_step'] = {
    * It checks/warns if the selected stepper instance has a config block.
    * @this Blockly.Block
    */
-  onchange: function() {
-    if (!this.workspace) return;  // Block has been deleted.
+  onchange: function(event) {
+    if (!this.workspace || event.type == Blockly.Events.MOVE ||
+        event.type == Blockly.Events.UI) {
+        return;  // Block deleted or irrelevant event
+    }
 
     var instanceName = this.getFieldValue('STEPPER_NAME')
     if (Blockly.Instances.isInstancePresent(instanceName, 'Stepper', this)) {

blockly/blocks/arduino/tone.js

@@ -35,8 +35,18 @@ Blockly.Blocks['io_tone'] = {
     this.setTooltip(Blockly.Msg.ARD_TONE_TIP);
     this.setHelpUrl('https://www.arduino.cc/en/Reference/tone');
   },
-  onchange: function() {
-    var freq = Blockly.Arduino.valueToCode(this, "FREQUENCY", Blockly.Arduino.ORDER_ATOMIC)
+  /**
+   * Called whenever anything on the workspace changes.
+   * It checks frequency values and sets a warning if out of range.
+   * @this Blockly.Block
+   */
+  onchange: function(event) {
+    if (!this.workspace || event.type == Blockly.Events.MOVE ||
+        event.type == Blockly.Events.UI) {
+        return;  // Block deleted or irrelevant event
+    }
+    var freq = Blockly.Arduino.valueToCode(
+        this, "FREQUENCY", Blockly.Arduino.ORDER_ATOMIC)
     if (freq < 31 || freq > 65535) {
       this.setWarningText(Blockly.Msg.ARD_TONE_WARNING, 'io_tone');
     } else {