Commit 2a681986 authored by Evan W. Patton's avatar Evan W. Patton Committed by Jeffrey I. Schiller

Fix logic for vertical event parameters

This commit restores the ability to change the orientation of the
parameters in an event handler block. The functionality is updated to
reflect the new events mechanism in Blockly.

Change-Id: Ib6d9c27b6e13838af886c0abf281e24ba57e6bbe
parent 8bc52d45
...@@ -183,6 +183,11 @@ Blockly.Blocks.component_event = { ...@@ -183,6 +183,11 @@ Blockly.Blocks.component_event = {
newDoInput.connection.connect(bodyConnection); newDoInput.connection.connect(bodyConnection);
} }
} }
if (Blockly.Events.isEnabled()) {
// Trigger a Blockly UI change event
Blockly.Events.fire(new Blockly.Events.Ui(this, 'parameter_orientation',
(!this.horizontalParameters).toString(), this.horizontalParameters.toString()))
}
} }
}, },
// Return a list of parameter names // Return a list of parameter names
......
...@@ -117,17 +117,17 @@ Blockly.FieldParameterFlydown.addHorizontalVerticalOption = function (block, opt ...@@ -117,17 +117,17 @@ Blockly.FieldParameterFlydown.addHorizontalVerticalOption = function (block, opt
if (block.getParameters) { if (block.getParameters) {
numParams = block.getParameters().length; numParams = block.getParameters().length;
} }
if (Blockly.collapse && ! this.collapsed && numParams > 0) { if (block.workspace.getTopWorkspace().options.collapse && ! this.collapsed && numParams > 0) {
var horizVertOption = var horizVertOption =
{ enabled: true, { enabled: true,
text: block.horizontalParameters ? Blockly.MSG_VERTICAL_PARAMETERS : Blockly.MSG_HORIZONTAL_PARAMETERS, text: block.horizontalParameters ? Blockly.Msg.VERTICAL_PARAMETERS : Blockly.Msg.HORIZONTAL_PARAMETERS,
callback: function () { block.setParameterOrientation(!block.horizontalParameters); } callback: function () { block.setParameterOrientation(!block.horizontalParameters); }
}; };
// Find the index of "Collapse Block" option and inset horizonta/vertical option before it // Find the index of "Collapse Block" option and inset horizonta/vertical option before it
var insertionIndex = 0; var insertionIndex = 0;
for (var option = null; option = options[insertionIndex]; insertionIndex++) { for (var option = null; option = options[insertionIndex]; insertionIndex++) {
if (option.text === Blockly.MSG_COLLAPSE_BLOCK) { if (option.text === Blockly.Msg.COLLAPSE_BLOCK) {
break; // Stop loop when insertion point found break; // Stop loop when insertion point found
} }
} }
...@@ -138,7 +138,7 @@ Blockly.FieldParameterFlydown.addHorizontalVerticalOption = function (block, opt ...@@ -138,7 +138,7 @@ Blockly.FieldParameterFlydown.addHorizontalVerticalOption = function (block, opt
// Remove an "Inline Inputs" option (if there is one) // Remove an "Inline Inputs" option (if there is one)
var removalIndex = -1; var removalIndex = -1;
for (var i = 0, option = null; option = options[i]; i++) { for (var i = 0, option = null; option = options[i]; i++) {
if (option.text === Blockly.MSG_INLINE_INPUTS) { if (option.text === Blockly.Msg.INLINE_INPUTS) {
removalIndex = i; removalIndex = i;
break; // Stop loop when insertion point found break; // Stop loop when insertion point found
} }
...@@ -147,7 +147,7 @@ Blockly.FieldParameterFlydown.addHorizontalVerticalOption = function (block, opt ...@@ -147,7 +147,7 @@ Blockly.FieldParameterFlydown.addHorizontalVerticalOption = function (block, opt
options.splice(removalIndex, 1); options.splice(removalIndex, 1);
} }
} }
} };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment