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

Fix defineTheme startHats (#3842)

Browse Source 
typeof null === "object", go figure..
This commit is contained in:
Sam El-Husseini
2020-04-22 15:38:50 -07:00
committed by GitHub
parent ba682040b1
commit 33cb4d6feb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/utils/object.js
View File

@@ -45,7 +45,7 @@ Blockly.utils.object.mixin = function(target, source) {
*/
Blockly.utils.object.deepMerge = function(target, source) {
for (var x in source) {
if (typeof source[x] === 'object') {
if (source[x] != null && typeof source[x] === 'object') {
target[x] = Blockly.utils.object.deepMerge(
target[x] || Object.create(null), source[x]);
} else {