From be43df9e8cf70c85d33da1b6f55daba66dc894fe Mon Sep 17 00:00:00 2001 From: Abby Date: Mon, 22 Jul 2019 10:45:05 -0700 Subject: [PATCH] Run the renaming script --- core/keyboard_nav/ast_node.js | 10 +++++----- core/keyboard_nav/cursor_svg.js | 14 +++++++------- core/keyboard_nav/navigation.js | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js index dff22c634..53d77c053 100644 --- a/core/keyboard_nav/ast_node.js +++ b/core/keyboard_nav/ast_node.js @@ -190,7 +190,7 @@ Blockly.ASTNode.createStackNode = function(topBlock) { /** * Creates an ast node pointing to a workpsace. * @param {Blockly.Workspace} workspace The workspace that we are on. - * @param {goog.math.Coordinate} wsCoordinate The position on the workspace for + * @param {Blockly.utils.Coordinate} wsCoordinate The position on the workspace for * this node. * @return {Blockly.ASTNode} An ast node pointing to a workspace and a position * on the workspace. @@ -241,7 +241,7 @@ Blockly.ASTNode.prototype.getType = function() { /** * The coordinate on the workspace. - * @return {goog.math.Coordinate} The workspace coordinate or null if the + * @return {Blockly.utils.Coordinate} The workspace coordinate or null if the * location is not a workspace. */ Blockly.ASTNode.prototype.getWsCoordinate = function() { @@ -540,7 +540,7 @@ Blockly.ASTNode.prototype.next = function() { //TODO: Need to limit this. The view is bounded to half a screen beyond //the furthest block. var newX = this.wsCoordinate_.x + Blockly.ASTNode.wsMove_; - var newWsCoordinate = new goog.math.Coordinate(newX, this.wsCoordinate_.y); + var newWsCoordinate = new Blockly.utils.Coordinate(newX, this.wsCoordinate_.y); var workspace = /** @type {Blockly.Workspace} */ (this.location_); return Blockly.ASTNode.createWorkspaceNode(workspace, newWsCoordinate); @@ -621,7 +621,7 @@ Blockly.ASTNode.prototype.prev = function() { switch (this.type_) { case Blockly.ASTNode.types.WORKSPACE: var newX = this.wsCoordinate_.x - Blockly.ASTNode.wsMove_; - var newCoord = new goog.math.Coordinate(newX, this.wsCoordinate_.y); + var newCoord = new Blockly.utils.Coordinate(newX, this.wsCoordinate_.y); var ws = /** @type {Blockly.Workspace} */ (this.location_); return Blockly.ASTNode.createWorkspaceNode(ws, newCoord); @@ -671,7 +671,7 @@ Blockly.ASTNode.prototype.out = function() { case Blockly.ASTNode.types.STACK: var blockPos = this.location_.getRelativeToSurfaceXY(); //TODO: Make sure this is in the bounds of the workspace - var wsCoordinate = new goog.math.Coordinate( + var wsCoordinate = new Blockly.utils.Coordinate( blockPos.x, blockPos.y + Blockly.ASTNode.DEFAULT_OFFSET_Y); return Blockly.ASTNode.createWorkspaceNode( this.location_.workspace, wsCoordinate); diff --git a/core/keyboard_nav/cursor_svg.js b/core/keyboard_nav/cursor_svg.js index 6175616f4..d7101fb18 100644 --- a/core/keyboard_nav/cursor_svg.js +++ b/core/keyboard_nav/cursor_svg.js @@ -116,7 +116,7 @@ Blockly.CursorSvg.prototype.getSvgRoot = function() { */ Blockly.CursorSvg.prototype.createDom = function() { this.svgGroup_ = - Blockly.utils.createSvgElement('g', { + Blockly.utils.dom.createSvgElement('g', { 'class': 'blocklyCursor' }, null); @@ -380,13 +380,13 @@ Blockly.CursorSvg.prototype.createCursorSvg_ = function() { var colour = this.isMarker_ ? Blockly.CursorSvg.MARKER_COLOR : Blockly.CursorSvg.CURSOR_COLOR; - this.cursorSvg_ = Blockly.utils.createSvgElement('g', + this.cursorSvg_ = Blockly.utils.dom.createSvgElement('g', { 'width': Blockly.CursorSvg.CURSOR_WIDTH, 'height': Blockly.CursorSvg.CURSOR_HEIGHT }, this.svgGroup_); - this.cursorSvgLine_ = Blockly.utils.createSvgElement('rect', + this.cursorSvgLine_ = Blockly.utils.dom.createSvgElement('rect', { 'x': '0', 'y': '0', @@ -397,7 +397,7 @@ Blockly.CursorSvg.prototype.createCursorSvg_ = function() { }, this.cursorSvg_); - this.cursorSvgRect_ = Blockly.utils.createSvgElement('rect', + this.cursorSvgRect_ = Blockly.utils.dom.createSvgElement('rect', { 'class': 'blocklyVerticalCursor', 'x': '0', @@ -408,7 +408,7 @@ Blockly.CursorSvg.prototype.createCursorSvg_ = function() { }, this.cursorSvg_); - this.cursorInputOutput_ = Blockly.utils.createSvgElement( + this.cursorInputOutput_ = Blockly.utils.dom.createSvgElement( 'path', { 'width': Blockly.CursorSvg.CURSOR_WIDTH, @@ -422,7 +422,7 @@ Blockly.CursorSvg.prototype.createCursorSvg_ = function() { // Markers don't blink. if (!this.isMarker_) { - Blockly.utils.createSvgElement('animate', + Blockly.utils.dom.createSvgElement('animate', { 'attributeType': 'XML', 'attributeName': 'fill', @@ -432,7 +432,7 @@ Blockly.CursorSvg.prototype.createCursorSvg_ = function() { }, this.cursorSvgLine_); - Blockly.utils.createSvgElement('animate', + Blockly.utils.dom.createSvgElement('animate', { 'attributeType': 'XML', 'attributeName': 'fill', diff --git a/core/keyboard_nav/navigation.js b/core/keyboard_nav/navigation.js index 8421e778e..8cf1bc631 100644 --- a/core/keyboard_nav/navigation.js +++ b/core/keyboard_nav/navigation.js @@ -611,7 +611,7 @@ Blockly.Navigation.focusWorkspace = function() { } else { var ws = cursor.workspace_; // TODO: Find the center of the visible workspace. - var wsCoord = new goog.math.Coordinate(100, 100); + var wsCoord = new Blockly.utils.Coordinate(100, 100); var wsNode = Blockly.ASTNode.createWorkspaceNode(ws, wsCoord); cursor.setLocation(wsNode); }