Fix issues with menu generations: should be class method

Author: bmcage

blockly/blocks/arduino/stepper.js

@@ -172,7 +172,7 @@ Blockly.Blocks['stepper_step'] = {
       this.setWarningText(null);
     } else {
       // Set a warning to select a valid stepper config
-      this.setWarningText(Blockly.Msg.ARD_STEPPER_STEP_WARN1);
+      this.setWarningText(Blockly.Msg.ARD_COMPONENT_WARN1.replace('%1', Blockly.Msg.ARD_STEPPER_COMPONENT).replace('%1', Blockly.Msg.ARD_STEPPER_COMPONENT));
     }
   }
 };

blockly/blocks/component_variable.js

@@ -40,11 +40,11 @@ goog.require('Blockly.Blocks');
  * @constructor
  */
 Blockly.Blocks.ComponentFieldVariable = function(varname, component_type, opt_validator) {
-  Blockly.Blocks.ComponentFieldVariable['component_type'] = component_type
+  this.component_type = component_type
   //override the dropdownCreate to use for this field
-  Blockly.FieldVariable.dropdownCreate = Blockly.Blocks.ComponentFieldVariable.dropdownCreateComponents;
+  this.dropdownCreate = Blockly.Blocks.ComponentFieldVariable.dropdownCreateComponents;
   Blockly.Blocks.ComponentFieldVariable.superClass_.constructor.call(this,
-      Blockly.Blocks.ComponentFieldVariable.dropdownCreateComponents, opt_validator);
+      varname, opt_validator);
   this.setValue(varname || '');
 };
 goog.inherits(Blockly.Blocks.ComponentFieldVariable, Blockly.FieldVariable);
@@ -106,7 +106,7 @@ Blockly.Blocks.ComponentFieldVariable.dropdownCreateComponents = function() {
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
     var variableList =
         Blockly.Blocks.ComponentFieldVariable.ComponentVariables(this.sourceBlock_.workspace, 
-                Blockly.Blocks.ComponentFieldVariable['component_type']);
+                this.component_type);
   } else {
     var variableList = [];
   }

blockly/core/field_variable.js

@@ -44,7 +44,7 @@ goog.require('goog.string');
  */
 Blockly.FieldVariable = function(varname, opt_validator) {
   Blockly.FieldVariable.superClass_.constructor.call(this,
-      Blockly.FieldVariable.dropdownCreate, opt_validator);
+      this.dropdownCreate, opt_validator);
   this.setValue(varname || '');
 };
 goog.inherits(Blockly.FieldVariable, Blockly.FieldDropdown);
@@ -124,7 +124,7 @@ Blockly.FieldVariable.prototype.setValue = function(newValue) {
  * @return {!Array.<string>} Array of variable names.
  * @this {!Blockly.FieldVariable}
  */
-Blockly.FieldVariable.dropdownCreate = function() {
+Blockly.FieldVariable.prototype.dropdownCreate = function() {
   if (this.sourceBlock_ && this.sourceBlock_.workspace) {
     var variableList =
         Blockly.Variables.allVariables(this.sourceBlock_.workspace);

blockly/msg/json/nl.json

@@ -437,7 +437,8 @@
 	"ARD_STEPPER_STEP": "beweeg stappenmotor",
 	"ARD_STEPPER_STEPS": "stappen",
 	"ARD_STEPPER_STEP_TIP": "Draait de stappenmotor een opgegeven aantal stappen",
-	"ARD_STEPPER_STEP_WARN1": "Een Stappenmotor Definieer blok met dezelfde stappenmotor naam moet toegevoegd worden om dit blok te gebruiken!",
+        "ARD_STEPPER_COMPONENT": "stappenmotor",
+	"ARD_COMPONENT_WARN1": "Een %1 Definieer blok met dezelfde %1 naam moet toegevoegd worden om dit blok te gebruiken!",
 	"ARD_TIME_DELAY": "wacht",
 	"ARD_TIME_MS": "milliseconden",
 	"ARD_TIME_DELAY_TIP": "Wacht de opgegeven tijd in milliseconden (duizendsten van een seconde)",

blockly/msg/messages.js

@@ -1183,7 +1183,8 @@ Blockly.Msg.ARD_STEPPER_SETUP_TIP = 'Configures a stepper motor pinout and other
 Blockly.Msg.ARD_STEPPER_STEP = 'move stepper';
 Blockly.Msg.ARD_STEPPER_STEPS = 'steps';
 Blockly.Msg.ARD_STEPPER_STEP_TIP = 'Turns the stepper motor a specific number of steps.';
-Blockly.Msg.ARD_STEPPER_STEP_WARN1 = 'A STEPPER configuration block with the same stepper name must be added to use this block!';
+Blockly.Msg.ARD_STEPPER_COMPONENT = 'stepper';
+Blockly.Msg.ARD_COMPONENT_WARN1 = 'A %1 configuration block with the same %1 name must be added to use this block!';
 Blockly.Msg.ARD_TIME_DELAY = 'wait';
 Blockly.Msg.ARD_TIME_MS = 'milliseconds';
 Blockly.Msg.ARD_TIME_DELAY_TIP = 'Wait specific time in milliseconds';