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

refactor: Rename Blockly.connectionTypes to Blockly.ConnectionType (#5407)

Browse Source 
* Renamed Blockly.connectionTypes to Blockly.ConnectionType
* Renamed core/connection_types.js to connection_type.js
* Add entry to renamings.js for renaming of Blockly.connectionTypes

Co-authored-by: Christopher Allen <cpcallen+git@google.com>
This commit is contained in:
Himanshu
2021-09-24 17:15:10 +05:30
committed by GitHub
parent de330c8874
commit 3629ed5f65
22 changed files with 137 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/renderers/common/constants.js
View File

@@ -19,7 +19,7 @@ const Svg = goog.require('Blockly.utils.Svg');
/* eslint-disable-next-line no-unused-vars */
const Theme = goog.requireType('Blockly.Theme');
const colour = goog.require('Blockly.utils.colour');
const connectionTypes = goog.require('Blockly.connectionTypes');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
const object = goog.require('Blockly.utils.object');
const svgPaths = goog.require('Blockly.utils.svgPaths');
@@ -959,11 +959,11 @@ ConstantProvider.prototype.makeOutsideCorners = function() {
*/
ConstantProvider.prototype.shapeFor = function(connection) {
switch (connection.type) {
case connectionTypes.INPUT_VALUE:
case connectionTypes.OUTPUT_VALUE:
case ConnectionType.INPUT_VALUE:
case ConnectionType.OUTPUT_VALUE:
return this.PUZZLE_TAB;
case connectionTypes.PREVIOUS_STATEMENT:
case connectionTypes.NEXT_STATEMENT:
case ConnectionType.PREVIOUS_STATEMENT:
case ConnectionType.NEXT_STATEMENT:
return this.NOTCH;
default:
throw Error('Unknown connection type');

10
core/renderers/common/debugger.js
View File

@@ -28,7 +28,7 @@ const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
const Row = goog.requireType('Blockly.blockRendering.Row');
const Svg = goog.require('Blockly.utils.Svg');
const Types = goog.require('Blockly.blockRendering.Types');
const connectionTypes = goog.require('Blockly.connectionTypes');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
@@ -227,19 +227,19 @@ Debug.prototype.drawConnection = function(conn) {
let colour;
let size;
let fill;
if (conn.type == connectionTypes.INPUT_VALUE) {
if (conn.type == ConnectionType.INPUT_VALUE) {
size = 4;
colour = 'magenta';
fill = 'none';
} else if (conn.type == connectionTypes.OUTPUT_VALUE) {
} else if (conn.type == ConnectionType.OUTPUT_VALUE) {
size = 2;
colour = 'magenta';
fill = colour;
} else if (conn.type == connectionTypes.NEXT_STATEMENT) {
} else if (conn.type == ConnectionType.NEXT_STATEMENT) {
size = 4;
colour = 'goldenrod';
fill = 'none';
} else if (conn.type == connectionTypes.PREVIOUS_STATEMENT) {
} else if (conn.type == ConnectionType.PREVIOUS_STATEMENT) {
size = 2;
colour = 'goldenrod';
fill = colour;

6
core/renderers/common/marker_svg.js
View File

@@ -28,7 +28,7 @@ const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
const Svg = goog.require('Blockly.utils.Svg');
/* eslint-disable-next-line no-unused-vars */
const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
const connectionTypes = goog.require('Blockly.connectionTypes');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
const svgPaths = goog.require('Blockly.utils.svgPaths');
const {ASTNode} = goog.require('Blockly.ASTNode');
@@ -217,9 +217,9 @@ MarkerSvg.prototype.showAtLocation_ = function(curNode) {
this.showWithBlock_(curNode);
} else if (curNode.getType() == ASTNode.types.OUTPUT) {
this.showWithOutput_(curNode);
} else if (connectionType == connectionTypes.INPUT_VALUE) {
} else if (connectionType == ConnectionType.INPUT_VALUE) {
this.showWithInput_(curNode);
} else if (connectionType == connectionTypes.NEXT_STATEMENT) {
} else if (connectionType == ConnectionType.NEXT_STATEMENT) {
this.showWithNext_(curNode);
} else if (curNode.getType() == ASTNode.types.PREVIOUS) {
this.showWithPrevious_(curNode);

8
core/renderers/common/renderer.js
View File

@@ -33,7 +33,7 @@ const Theme = goog.requireType('Blockly.Theme');
/* eslint-disable-next-line no-unused-vars */
const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
const blockRendering = goog.require('Blockly.blockRendering');
const connectionTypes = goog.require('Blockly.connectionTypes');
const ConnectionType = goog.require('Blockly.ConnectionType');
const object = goog.require('Blockly.utils.object');
/* eslint-disable-next-line no-unused-vars */
const {Block} = goog.requireType('Blockly.Block');
@@ -248,7 +248,7 @@ Renderer.prototype.shouldHighlightConnection = function(_conn) {
Renderer.prototype.orphanCanConnectAtEnd = function(
topBlock, orphanBlock, localType) {
const orphanConnection =
(localType === connectionTypes.OUTPUT_VALUE ?
(localType === ConnectionType.OUTPUT_VALUE ?
orphanBlock.outputConnection :
orphanBlock.previousConnection);
return !!Connection.getConnectionForOrphanedConnection(
@@ -269,8 +269,8 @@ Renderer.prototype.orphanCanConnectAtEnd = function(
*/
Renderer.prototype.getConnectionPreviewMethod = function(
closest, local, topBlock) {
if (local.type == connectionTypes.OUTPUT_VALUE ||
local.type == connectionTypes.PREVIOUS_STATEMENT) {
if (local.type == ConnectionType.OUTPUT_VALUE ||
local.type == ConnectionType.PREVIOUS_STATEMENT) {
if (!closest.isConnected() ||
this.orphanCanConnectAtEnd(
topBlock,

10
core/renderers/zelos/constants.js
View File

@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
const Svg = goog.require('Blockly.utils.Svg');
const connectionTypes = goog.require('Blockly.connectionTypes');
const ConnectionType = goog.require('Blockly.ConnectionType');
const dom = goog.require('Blockly.utils.dom');
const object = goog.require('Blockly.utils.object');
const svgPaths = goog.require('Blockly.utils.svgPaths');
@@ -641,8 +641,8 @@ ConstantProvider.prototype.shapeFor = function(connection) {
}
let outputShape;
switch (connection.type) {
case connectionTypes.INPUT_VALUE:
case connectionTypes.OUTPUT_VALUE:
case ConnectionType.INPUT_VALUE:
case ConnectionType.OUTPUT_VALUE:
outputShape = connection.getSourceBlock().getOutputShape();
// If the block has an output shape set, use that instead.
if (outputShape != null) {
@@ -666,8 +666,8 @@ ConstantProvider.prototype.shapeFor = function(connection) {
return this.ROUNDED;
}
return this.ROUNDED;
case connectionTypes.PREVIOUS_STATEMENT:
case connectionTypes.NEXT_STATEMENT:
case ConnectionType.PREVIOUS_STATEMENT:
case ConnectionType.NEXT_STATEMENT:
return this.NOTCH;
default:
throw Error('Unknown type');

8
core/renderers/zelos/renderer.js
View File

@@ -27,7 +27,7 @@ const Theme = goog.requireType('Blockly.Theme');
/* eslint-disable-next-line no-unused-vars */
const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
const blockRendering = goog.require('Blockly.blockRendering');
const connectionTypes = goog.require('Blockly.connectionTypes');
const ConnectionType = goog.require('Blockly.ConnectionType');
const object = goog.require('Blockly.utils.object');
/* eslint-disable-next-line no-unused-vars */
const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
@@ -115,8 +115,8 @@ Renderer.prototype.makePathObject = function(root, style) {
* @override
*/
Renderer.prototype.shouldHighlightConnection = function(conn) {
return conn.type != connectionTypes.INPUT_VALUE &&
conn.type !== connectionTypes.OUTPUT_VALUE;
return conn.type != ConnectionType.INPUT_VALUE &&
conn.type !== ConnectionType.OUTPUT_VALUE;
};
/**
@@ -124,7 +124,7 @@ Renderer.prototype.shouldHighlightConnection = function(conn) {
*/
Renderer.prototype.getConnectionPreviewMethod = function(
closest, local, topBlock) {
if (local.type == connectionTypes.OUTPUT_VALUE) {
if (local.type == ConnectionType.OUTPUT_VALUE) {
if (!closest.isConnected()) {
return InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE;
}