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

Migrate object.js to goog.module

Browse Source
This commit is contained in:
Aaron Dodson
2021-07-13 15:30:56 -07:00
parent 78b8e2fa85
commit d224a2341d
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/utils/object.js
View File

@@ -14,7 +14,8 @@
* @name Blockly.utils.object
* @namespace
*/
goog.provide('Blockly.utils.object');
goog.module('Blockly.utils.object');
goog.module.declareLegacyNamespace();
/**
@@ -23,7 +24,7 @@ goog.provide('Blockly.utils.object');
* @param {!Function} parentCtor Parent class.
* @suppress {strictMissingProperties} superClass_ is not defined on Function.
*/
Blockly.utils.object.inherits = function(childCtor, parentCtor) {
const inherits = function(childCtor, parentCtor) {
// Set a .superClass_ property so that methods can call parent methods
// without hard-coding the parent class name.
// Could be replaced by ES6's super().
@@ -45,7 +46,7 @@ Blockly.utils.object.inherits = function(childCtor, parentCtor) {
* @param {!Object} target Target.
* @param {!Object} source Source.
*/
Blockly.utils.object.mixin = function(target, source) {
const mixin = function(target, source) {
for (const x in source) {
target[x] = source[x];
}
@@ -57,11 +58,10 @@ Blockly.utils.object.mixin = function(target, source) {
* @param {!Object} source Source.
* @return {!Object} The resulting object.
*/
Blockly.utils.object.deepMerge = function(target, source) {
const deepMerge = function(target, source) {
for (const x in source) {
if (source[x] != null && typeof source[x] === 'object') {
target[x] = Blockly.utils.object.deepMerge(
target[x] || Object.create(null), source[x]);
target[x] = deepMerge(target[x] || Object.create(null), source[x]);
} else {
target[x] = source[x];
}
@@ -74,7 +74,7 @@ Blockly.utils.object.deepMerge = function(target, source) {
* @param {!Object} obj Object containing values.
* @return {!Array} Array of values.
*/
Blockly.utils.object.values = function(obj) {
const values = function(obj) {
if (Object.values) {
return Object.values(obj);
}
@@ -83,3 +83,10 @@ Blockly.utils.object.values = function(obj) {
return obj[e];
});
};
exports = {
inherits,
mixin,
deepMerge,
values,
}

2
tests/deps.js
View File

@@ -179,7 +179,7 @@ goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerato
goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);
goog.addDependency('../../core/utils/math.js', ['Blockly.utils.math'], []);
goog.addDependency('../../core/utils/metrics.js', ['Blockly.utils.Metrics'], []);
goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], []);
goog.addDependency('../../core/utils/object.js', ['Blockly.utils.object'], [], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/utils/rect.js', ['Blockly.utils.Rect'], []);
goog.addDependency('../../core/utils/size.js', ['Blockly.utils.Size'], []);
goog.addDependency('../../core/utils/string.js', ['Blockly.utils.string'], []);