CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-05 08:00:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize conditionals for block context menu (#2390)

Browse Source 
* Reorganize conditionals for block context menu

* Disable comments and disabling in block factory
This commit is contained in:
ahigerd
2019-04-18 10:49:07 -05:00
committed by RoboErikG
parent ae112354fb
commit bc77024670
2 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
core/block_svg.js
View File

@@ -647,53 +647,58 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
var block = this;
var menuOptions = [];
if (this.isDeletable() && this.isMovable() && !block.isInFlyout) {
menuOptions.push(Blockly.ContextMenu.blockDuplicateOption(block));
if (this.isEditable() && !this.collapsed_ &&
this.workspace.options.comments) {
if (!this.isInFlyout) {
if (this.isDeletable() && this.isMovable()) {
menuOptions.push(Blockly.ContextMenu.blockDuplicateOption(block));
}
if (this.workspace.options.comments && !this.collapsed_ &&
this.isEditable()) {
menuOptions.push(Blockly.ContextMenu.blockCommentOption(block));
}
// Option to make block inline.
if (!this.collapsed_) {
for (var i = 1; i < this.inputList.length; i++) {
if (this.inputList[i - 1].type != Blockly.NEXT_STATEMENT &&
this.inputList[i].type != Blockly.NEXT_STATEMENT) {
// Only display this option if there are two value or dummy inputs
// next to each other.
var inlineOption = {enabled: true};
var isInline = this.getInputsInline();
inlineOption.text = isInline ?
Blockly.Msg['EXTERNAL_INPUTS'] : Blockly.Msg['INLINE_INPUTS'];
inlineOption.callback = function() {
block.setInputsInline(!isInline);
if (this.isMovable()) {
if (!this.collapsed_) {
// Option to make block inline.
for (var i = 1; i < this.inputList.length; i++) {
if (this.inputList[i - 1].type != Blockly.NEXT_STATEMENT &&
this.inputList[i].type != Blockly.NEXT_STATEMENT) {
// Only display this option if there are two value or dummy inputs
// next to each other.
var inlineOption = {enabled: true};
var isInline = this.getInputsInline();
inlineOption.text = isInline ?
Blockly.Msg['EXTERNAL_INPUTS'] : Blockly.Msg['INLINE_INPUTS'];
inlineOption.callback = function() {
block.setInputsInline(!isInline);
};
menuOptions.push(inlineOption);
break;
}
}
// Option to collapse block
if (this.workspace.options.collapse) {
var collapseOption = {enabled: true};
collapseOption.text = Blockly.Msg['COLLAPSE_BLOCK'];
collapseOption.callback = function() {
block.setCollapsed(true);
};
menuOptions.push(inlineOption);
break;
menuOptions.push(collapseOption);
}
} else {
// Option to expand block.
if (this.workspace.options.collapse) {
var expandOption = {enabled: true};
expandOption.text = Blockly.Msg['EXPAND_BLOCK'];
expandOption.callback = function() {
block.setCollapsed(false);
};
menuOptions.push(expandOption);
}
}
}
if (this.workspace.options.collapse) {
// Option to collapse/expand block.
if (this.collapsed_) {
var expandOption = {enabled: true};
expandOption.text = Blockly.Msg['EXPAND_BLOCK'];
expandOption.callback = function() {
block.setCollapsed(false);
};
menuOptions.push(expandOption);
} else {
var collapseOption = {enabled: true};
collapseOption.text = Blockly.Msg['COLLAPSE_BLOCK'];
collapseOption.callback = function() {
block.setCollapsed(true);
};
menuOptions.push(collapseOption);
}
}
if (this.workspace.options.disable) {
if (this.workspace.options.disable && this.isEditable()) {
// Option to disable/enable block.
var disableOption = {
text: this.disabled ?
@@ -713,7 +718,9 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
menuOptions.push(disableOption);
}
menuOptions.push(Blockly.ContextMenu.blockDeleteOption(block));
if (this.isDeletable()) {
menuOptions.push(Blockly.ContextMenu.blockDeleteOption(block));
}
}
menuOptions.push(Blockly.ContextMenu.blockHelpOption(block));

2
demos/blockfactory/app_controller.js
View File

@@ -718,6 +718,8 @@ AppController.prototype.init = function() {
BlockFactory.mainWorkspace = Blockly.inject('blockly',
{collapse: false,
toolbox: toolbox,
comments: false,
disable: false,
media: '../../media/'});
// Add tab handlers for switching between Block Factory and Block Exporter.