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

refactor: convert blocksvg and block to ES6 classes (#5952)

Browse Source 
* refact: move super call to top of block svg

* refact: run conversion script on block svg and block

* fix: make debug build happy

* fix: tests

* style: format

* fix: cleanup from rebase

* fix: use new.target instead of a new parameter

* fix: add more overridden casted methods to BlockSvg

* style: fix typos

* style: move override tags to the end of JSDoc

* fix: cleanup from rebase
This commit is contained in:
Beka Westberg
2022-02-28 09:48:37 -08:00
committed by GitHub
parent cb4521b645
commit fa14e9d6de
22 changed files with 3987 additions and 3790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/serialization/blocks.js
View File

@@ -23,6 +23,8 @@ const serializationRegistry = goog.require('Blockly.serialization.registry');
const {BadConnectionCheck, MissingBlockType, MissingConnection, RealChildOfShadow} = goog.require('Blockly.serialization.exceptions');
/* eslint-disable-next-line no-unused-vars */
const {Block} = goog.requireType('Blockly.Block');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
// eslint-disable-next-line no-unused-vars
const {Connection} = goog.requireType('Blockly.Connection');
// eslint-disable-next-line no-unused-vars
@@ -350,9 +352,10 @@ const appendInternal = function(state, workspace, {
// Adding connections to the connection db is expensive. This defers that
// operation to decrease load time.
if (workspace.rendered) {
const blockSvg = /** @type {!BlockSvg} */ (block);
setTimeout(() => {
if (!block.disposed) {
block.setConnectionTracking(true);
if (!blockSvg.disposed) {
blockSvg.setConnectionTracking(true);
}
}, 1);
}
@@ -513,9 +516,10 @@ const loadIcons = function(block, state) {
block.setCommentText(comment['text']);
block.commentModel.pinned = comment['pinned'];
block.commentModel.size = new Size(comment['width'], comment['height']);
if (comment['pinned'] && block.getCommentIcon && !block.isInFlyout) {
if (comment['pinned'] && block.rendered && !block.isInFlyout) {
// Give the block a chance to be positioned and rendered before showing.
setTimeout(() => block.getCommentIcon().setVisible(true), 1);
const blockSvg = /** @type {!BlockSvg} */ (block);
setTimeout(() => blockSvg.getCommentIcon().setVisible(true), 1);
}
}
};
@@ -607,12 +611,13 @@ const loadConnection = function(connection, connectionState) {
*/
const initBlock = function(block, rendered) {
if (rendered) {
const blockSvg = /** @type {!BlockSvg} */ (block);
// Adding connections to the connection db is expensive. This defers that
// operation to decrease load time.
block.setConnectionTracking(false);
blockSvg.setConnectionTracking(false);
block.initSvg();
block.render(false);
blockSvg.initSvg();
blockSvg.render(false);
} else {
block.initModel();
}