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

Revert "Properly set the display style on blocks when connections are unhidden"

Browse Source 
This reverts commit bacfae24dd.
This commit is contained in:
Erik Pasternak
2019-07-19 15:56:23 -07:00
committed by Rachel Fenichel
parent 198e445cb7
commit a002621ec2
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/rendered_connection.js
View File

@@ -283,12 +283,6 @@ Blockly.RenderedConnection.prototype.setHidden = function(hidden) {
} else if (!hidden && !this.inDB_) {
this.db_.addConnection(this);
}
if (this.isSuperior() && this.targetBlock()) {
var display = hidden ? 'none' : 'block';
var renderedBlock = this.targetBlock();
renderedBlock.getSvgRoot().style.display = display;
renderedBlock.rendered = !hidden;
}
};
/**
@@ -350,6 +344,11 @@ Blockly.RenderedConnection.prototype.connect = function(otherConnection) {
} else {
superiorConnection.unhideAll();
}
var renderedBlock = superiorConnection.targetBlock();
var display = superiorConnection.hidden_ ? 'none' : 'block';
renderedBlock.getSvgRoot().style.display = display;
renderedBlock.rendered = !superiorConnection.hidden_;
}
};
@@ -359,17 +358,17 @@ Blockly.RenderedConnection.prototype.connect = function(otherConnection) {
*/
Blockly.RenderedConnection.prototype.disconnect = function() {
var superiorConnection = this.isSuperior() ? this : this.targetConnection;
var rehide = false;
if (this.targetConnection && superiorConnection.hidden_) {
superiorConnection.unhideAll();
rehide = true;
}
Blockly.RenderedConnection.superClass_.disconnect.call(this);
if (rehide) {
var renderedBlock = superiorConnection.targetBlock();
renderedBlock.getSvgRoot().style.display = 'block';
renderedBlock.rendered = true;
// Set the hidden state for the connection back to true so shadow blocks
// will be hidden.
superiorConnection.setHidden(true);
}
Blockly.RenderedConnection.superClass_.disconnect.call(this);
};
/**