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

Migrate core/renderers/zelos/marker_svg.js to goog.module

Browse Source
This commit is contained in:
kozbial
2021-08-12 15:43:30 -07:00
committed by Monica Kozbial
parent 428621688f
commit 42ce46bdd8
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/renderers/zelos/marker_svg.js
View File

@@ -10,10 +10,12 @@
*/
'use strict';
goog.provide('Blockly.zelos.MarkerSvg');
goog.module('Blockly.zelos.MarkerSvg');
goog.module.declareLegacyNamespace();
goog.require('Blockly.blockRendering.MarkerSvg');
goog.require('Blockly.utils.dom');
goog.require('Blockly.utils.object');
goog.require('Blockly.utils.Svg');
goog.requireType('Blockly.ASTNode');
@@ -33,11 +35,11 @@ goog.requireType('Blockly.WorkspaceSvg');
* @constructor
* @extends {Blockly.blockRendering.MarkerSvg}
*/
Blockly.zelos.MarkerSvg = function(workspace, constants, marker) {
Blockly.zelos.MarkerSvg.superClass_.constructor.call(
const MarkerSvg = function(workspace, constants, marker) {
MarkerSvg.superClass_.constructor.call(
this, workspace, constants, marker);
};
Blockly.utils.object.inherits(Blockly.zelos.MarkerSvg,
Blockly.utils.object.inherits(MarkerSvg,
Blockly.blockRendering.MarkerSvg);
/**
@@ -45,7 +47,7 @@ Blockly.utils.object.inherits(Blockly.zelos.MarkerSvg,
* @param {!Blockly.ASTNode} curNode The node to draw the marker for.
* @private
*/
Blockly.zelos.MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
const connection = /** @type {!Blockly.Connection} */ (curNode.getLocation());
const offsetInBlock = connection.getOffsetInBlock();
@@ -58,14 +60,14 @@ Blockly.zelos.MarkerSvg.prototype.showWithInputOutput_ = function(curNode) {
/**
* @override
*/
Blockly.zelos.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
MarkerSvg.prototype.showWithOutput_ = function(curNode) {
this.showWithInputOutput_(curNode);
};
/**
* @override
*/
Blockly.zelos.MarkerSvg.prototype.showWithInput_ = function(curNode) {
MarkerSvg.prototype.showWithInput_ = function(curNode) {
this.showWithInputOutput_(curNode);
};
@@ -73,7 +75,7 @@ Blockly.zelos.MarkerSvg.prototype.showWithInput_ = function(curNode) {
* Draw a rectangle around the block.
* @param {!Blockly.ASTNode} curNode The current node of the marker.
*/
Blockly.zelos.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
MarkerSvg.prototype.showWithBlock_ = function(curNode) {
const block = /** @type {!Blockly.BlockSvg} */ (curNode.getLocation());
// Gets the height and width of entire stack.
@@ -91,7 +93,7 @@ Blockly.zelos.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
* @param {number} y The y position of the circle.
* @private
*/
Blockly.zelos.MarkerSvg.prototype.positionCircle_ = function(x, y) {
MarkerSvg.prototype.positionCircle_ = function(x, y) {
this.markerCircle_.setAttribute('cx', x);
this.markerCircle_.setAttribute('cy', y);
this.currentMarkerSvg = this.markerCircle_;
@@ -100,15 +102,15 @@ Blockly.zelos.MarkerSvg.prototype.positionCircle_ = function(x, y) {
/**
* @override
*/
Blockly.zelos.MarkerSvg.prototype.hide = function() {
Blockly.zelos.MarkerSvg.superClass_.hide.call(this);
MarkerSvg.prototype.hide = function() {
MarkerSvg.superClass_.hide.call(this);
this.markerCircle_.style.display = 'none';
};
/**
* @override
*/
Blockly.zelos.MarkerSvg.prototype.createDomInternal_ = function() {
MarkerSvg.prototype.createDomInternal_ = function() {
/* This markup will be generated and added to the .svgGroup_:
<g>
<rect width="100" height="5">
@@ -118,7 +120,7 @@ Blockly.zelos.MarkerSvg.prototype.createDomInternal_ = function() {
</g>
*/
Blockly.zelos.MarkerSvg.superClass_.createDomInternal_.call(this);
MarkerSvg.superClass_.createDomInternal_.call(this);
this.markerCircle_ = Blockly.utils.dom.createSvgElement(
Blockly.utils.Svg.CIRCLE, {
@@ -142,8 +144,8 @@ Blockly.zelos.MarkerSvg.prototype.createDomInternal_ = function() {
/**
* @override
*/
Blockly.zelos.MarkerSvg.prototype.applyColour_ = function(curNode) {
Blockly.zelos.MarkerSvg.superClass_.applyColour_.call(this, curNode);
MarkerSvg.prototype.applyColour_ = function(curNode) {
MarkerSvg.superClass_.applyColour_.call(this, curNode);
this.markerCircle_.setAttribute('fill', this.colour_);
this.markerCircle_.setAttribute('stroke', this.colour_);
@@ -153,3 +155,5 @@ Blockly.zelos.MarkerSvg.prototype.applyColour_ = function(curNode) {
this.markerCircle_.firstChild.setAttribute('values', values);
}
};
exports = MarkerSvg;

2
tests/deps.js
View File

@@ -166,7 +166,7 @@ goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos
goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);