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

Migrate selected from Blockly to Blockly.common (#5489)

Browse Source 
* Add getSelected/setSelected to core/common.js

* Migrate core to use Blockly.common.getSelected/setSelected instead of Blockly.selected

* Migrate demos to use Blockly.common.getSelected/setSelected instead of Blockly.selected

* Remove Blockly.selected

* Use variable instead of calling common.getSelected() multiple times

* Add accessor for selected on Blockly

* Add renaming record for Blockly.selected -> Blockly.common.getSelected/setSelected
This commit is contained in:
Aaron Dodson
2021-09-17 11:42:43 -07:00
committed by GitHub
parent dbf10cf167
commit 7aab18409f
17 changed files with 117 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/block_svg.js
View File

@@ -313,16 +313,16 @@ BlockSvg.prototype.select = function() {
this.getParent().select();
return;
}
if (Blockly.selected == this) {
if (common.getSelected() == this) {
return;
}
let oldId = null;
if (Blockly.selected) {
oldId = Blockly.selected.id;
if (common.getSelected()) {
oldId = common.getSelected().id;
// Unselect any previously selected block.
Events.disable();
try {
Blockly.selected.unselect();
common.getSelected().unselect();
} finally {
Events.enable();
}
@@ -330,7 +330,7 @@ BlockSvg.prototype.select = function() {
const event =
new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
Events.fire(event);
Blockly.selected = this;
common.setSelected(this);
this.addSelect();
};
@@ -339,14 +339,14 @@ BlockSvg.prototype.select = function() {
* if the block is currently selected.
*/
BlockSvg.prototype.unselect = function() {
if (Blockly.selected != this) {
if (common.getSelected() != this) {
return;
}
const event =
new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
event.workspaceId = this.workspace.id;
Events.fire(event);
Blockly.selected = null;
common.setSelected(null);
this.removeSelect();
};
@@ -925,7 +925,7 @@ BlockSvg.prototype.dispose = function(healStack, animate) {
// contents once the block is disposed.
const blockWorkspace = this.workspace;
// If this block is being dragged, unlink the mouse events.
if (Blockly.selected == this) {
if (common.getSelected() == this) {
this.unselect();
this.workspace.cancelCurrentGesture();
}