Skip to content

Don't allow block deletion in the flyout. Make copy-paste always copy to the main workspace #1599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rachel-fenichel merged 2 commits into from
Feb 12, 2018
Merged

Don't allow block deletion in the flyout. Make copy-paste always copy to the main workspace #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57852f0
Don't allow block deletion in the flyout. Make copy-paste always cop…
rachel-fenichel Feb 9, 2018
f471a23
Add comment
rachel-fenichel Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions core/blockly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,16 @@ Blockly.onKeyDown_ = function(e) {
}
if (Blockly.selected &&
Blockly.selected.isDeletable() && Blockly.selected.isMovable()) {
// Don't allow copying immovable or undeletable blocks. The next step
// would be to paste, which would create additional undeletable/immovable
// blocks on the workspace.
if (e.keyCode == 67) {
// 'c' for copy.
Blockly.hideChaff();
Blockly.copy_(Blockly.selected);
} else if (e.keyCode == 88) {
// 'x' for cut.
} else if (e.keyCode == 88 && !Blockly.selected.workspace.isFlyout) {
// 'x' for cut, but not in a flyout.
// Don't even copy the selected item in the flyout.
Blockly.copy_(Blockly.selected);
deleteBlock = true;
}
Expand All @@ -216,7 +220,13 @@ Blockly.onKeyDown_ = function(e) {
// 'v' for paste.
if (Blockly.clipboardXml_) {
Blockly.Events.setGroup(true);
Blockly.clipboardSource_.paste(Blockly.clipboardXml_);
// Pasting always pastes to the main workspace, even if the copy started
// in a flyout workspace.
var workspace = Blockly.clipboardSource_;
if (workspace.isFlyout) {
workspace = workspace.targetWorkspace;
}
workspace.paste(Blockly.clipboardXml_);
Blockly.Events.setGroup(false);
}
} else if (e.keyCode == 90) {
Expand All @@ -225,8 +235,9 @@ Blockly.onKeyDown_ = function(e) {
Blockly.mainWorkspace.undo(e.shiftKey);
}
}
if (deleteBlock) {
// Common code for delete and cut.
// Common code for delete and cut.
// Don't delete in the flyout.
if (deleteBlock && !Blockly.selected.workspace.isFlyout) {
Blockly.Events.setGroup(true);
Blockly.hideChaff();
Blockly.selected.dispose(/* heal */ true, true);
Expand Down
8 changes: 8 additions & 0 deletions core/workspace_svg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,14 @@ Blockly.WorkspaceSvg.prototype.flyoutButtonCallbacks_ = {};
*/
Blockly.WorkspaceSvg.prototype.toolboxCategoryCallbacks_ = {};

/**
* In a flyout, the target workspace where blocks should be placed after a drag.
* Otherwise null.
* @type {?Blockly.WorkspaceSvg}
* @package
*/
Blockly.WorkspaceSvg.prototype.targetWorkspace = null;

/**
* Inverted screen CTM, for use in mouseToSvg.
* @type {SVGMatrix}
Expand Down