Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-06 16:26:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1187 from etimberg/fix/config-merge-clone

Browse Source 
Fix an error when merging null config values
This commit is contained in:
Evert Timberg
2015-06-09 20:36:44 -04:00
parent 9dc63f0349 97a2232fbf
commit bd39534c2f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Chart.Core.js
View File

@@ -206,7 +206,7 @@
baseArray.push(valueObj); // nothing to merge
}
});
} else if (base.hasOwnProperty(key) && typeof base[key] == "object" && typeof value == "object") {
} else if (base.hasOwnProperty(key) && typeof base[key] == "object" && base[key] !== null && typeof value == "object") {
// If we are overwriting an object with an object, do a merge of the properties.
base[key] = helpers.configMerge(base[key], value);
} else {