From 224af0aa6bb17b3b6e2c7cc7c01daae75ccc7122 Mon Sep 17 00:00:00 2001 From: Maribeth Bottorff Date: Thu, 6 Oct 2022 13:05:00 -0700 Subject: [PATCH] fix: remove deprecated use of objectUtils from generators (#6499) --- generators/javascript.js | 3 +-- generators/lua.js | 3 +-- generators/php.js | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/generators/javascript.js b/generators/javascript.js index 75220f760..c9634057c 100644 --- a/generators/javascript.js +++ b/generators/javascript.js @@ -13,7 +13,6 @@ goog.module('Blockly.JavaScript'); const Variables = goog.require('Blockly.Variables'); -const objectUtils = goog.require('Blockly.utils.object'); const stringUtils = goog.require('Blockly.utils.string'); const {Block} = goog.requireType('Blockly.Block'); const {Generator} = goog.require('Blockly.Generator'); @@ -169,7 +168,7 @@ JavaScript.init = function(workspace) { */ JavaScript.finish = function(code) { // Convert the definitions dictionary into a list. - const definitions = objectUtils.values(this.definitions_); + const definitions = Object.values(this.definitions_); // Call Blockly.Generator's finish. code = Object.getPrototypeOf(this).finish.call(this, code); this.isInitialized = false; diff --git a/generators/lua.js b/generators/lua.js index bf12f95a2..aec7db2cf 100644 --- a/generators/lua.js +++ b/generators/lua.js @@ -13,7 +13,6 @@ goog.module('Blockly.Lua'); -const objectUtils = goog.require('Blockly.utils.object'); const stringUtils = goog.require('Blockly.utils.string'); const {Block} = goog.requireType('Blockly.Block'); const {Generator} = goog.require('Blockly.Generator'); @@ -115,7 +114,7 @@ Lua.init = function(workspace) { */ Lua.finish = function(code) { // Convert the definitions dictionary into a list. - const definitions = objectUtils.values(this.definitions_); + const definitions = Object.values(this.definitions_); // Call Blockly.Generator's finish. code = Object.getPrototypeOf(this).finish.call(this, code); this.isInitialized = false; diff --git a/generators/php.js b/generators/php.js index 748141491..f47d763a4 100644 --- a/generators/php.js +++ b/generators/php.js @@ -12,7 +12,6 @@ goog.module('Blockly.PHP'); -const objectUtils = goog.require('Blockly.utils.object'); const stringUtils = goog.require('Blockly.utils.string'); const {Block} = goog.requireType('Blockly.Block'); const {Generator} = goog.require('Blockly.Generator'); @@ -154,7 +153,7 @@ PHP.init = function(workspace) { */ PHP.finish = function(code) { // Convert the definitions dictionary into a list. - const definitions = objectUtils.values(this.definitions_); + const definitions = Object.values(this.definitions_); // Call Blockly.Generator's finish. code = Object.getPrototypeOf(this).finish.call(this, code); this.isInitialized = false;