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

chore: remove underscores from private properties in grid.ts (#6375)

Browse Source 
* chore: remove underscores from private properties in grid.ts

* chore: remove unused property
This commit is contained in:
Rachel Fenichel
2022-08-24 16:42:49 -04:00
committed by GitHub
parent 60bc01acc8
commit e50ad59ffe
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/grid.ts
View File

@@ -24,16 +24,11 @@ import {GridOptions} from './blockly_options.js';
* @alias Blockly.Grid * @alias Blockly.Grid
*/ */
export class Grid { export class Grid {
/** private readonly spacing: number;
* The scale of the grid, used to set stroke width on grid lines. private readonly length: number;
* This should always be the same as the workspace scale. private readonly line1: SVGElement;
*/ private readonly line2: SVGElement;
private scale_ = 1; private readonly snapToGrid: boolean;
private readonly spacing_: number;
private readonly length_: number;
private readonly line1_: SVGElement;
private readonly line2_: SVGElement;
private readonly snapToGrid_: boolean;
/** /**
* @param pattern The grid's SVG pattern, created during injection. * @param pattern The grid's SVG pattern, created during injection.
@@ -43,19 +38,19 @@ export class Grid {
*/ */
constructor(private pattern: SVGElement, options: GridOptions) { constructor(private pattern: SVGElement, options: GridOptions) {
/** The spacing of the grid lines (in px). */ /** The spacing of the grid lines (in px). */
this.spacing_ = options['spacing'] ?? 0; this.spacing = options['spacing'] ?? 0;
/** How long the grid lines should be (in px). */ /** How long the grid lines should be (in px). */
this.length_ = options['length'] ?? 1; this.length = options['length'] ?? 1;
/** The horizontal grid line, if it exists. */ /** The horizontal grid line, if it exists. */
this.line1_ = pattern.firstChild as SVGElement; this.line1 = pattern.firstChild as SVGElement;
/** The vertical grid line, if it exists. */ /** The vertical grid line, if it exists. */
this.line2_ = this.line1_ && this.line1_.nextSibling as SVGElement; this.line2 = this.line1 && this.line1.nextSibling as SVGElement;
/** Whether blocks should snap to the grid. */ /** Whether blocks should snap to the grid. */
this.snapToGrid_ = options['snap'] ?? false; this.snapToGrid = options['snap'] ?? false;
} }
/** /**
@@ -65,7 +60,7 @@ export class Grid {
* @internal * @internal
*/ */
shouldSnap(): boolean { shouldSnap(): boolean {
return this.snapToGrid_; return this.snapToGrid;
} }
/** /**
@@ -75,7 +70,7 @@ export class Grid {
* @internal * @internal
*/ */
getSpacing(): number { getSpacing(): number {
return this.spacing_; return this.spacing;
} }
/** /**
@@ -96,23 +91,22 @@ export class Grid {
* @internal * @internal
*/ */
update(scale: number) { update(scale: number) {
this.scale_ = scale;
// MSIE freaks if it sees a 0x0 pattern, so set empty patterns to 100x100. // MSIE freaks if it sees a 0x0 pattern, so set empty patterns to 100x100.
const safeSpacing = this.spacing_ * scale || 100; const safeSpacing = this.spacing * scale || 100;
this.pattern.setAttribute('width', safeSpacing.toString()); this.pattern.setAttribute('width', safeSpacing.toString());
this.pattern.setAttribute('height', safeSpacing.toString()); this.pattern.setAttribute('height', safeSpacing.toString());
let half = Math.floor(this.spacing_ / 2) + 0.5; let half = Math.floor(this.spacing / 2) + 0.5;
let start = half - this.length_ / 2; let start = half - this.length / 2;
let end = half + this.length_ / 2; let end = half + this.length / 2;
half *= scale; half *= scale;
start *= scale; start *= scale;
end *= scale; end *= scale;
this.setLineAttributes_(this.line1_, scale, start, end, half, half); this.setLineAttributes(this.line1, scale, start, end, half, half);
this.setLineAttributes_(this.line2_, scale, half, half, start, end); this.setLineAttributes(this.line2, scale, half, half, start, end);
} }
/** /**
@@ -126,7 +120,7 @@ export class Grid {
* @param y1 The new y start position of the line (in px). * @param y1 The new y start position of the line (in px).
* @param y2 The new y end position of the line (in px). * @param y2 The new y end position of the line (in px).
*/ */
private setLineAttributes_( private setLineAttributes(
line: SVGElement, width: number, x1: number, x2: number, y1: number, line: SVGElement, width: number, x1: number, x2: number, y1: number,
y2: number) { y2: number) {
if (line) { if (line) {