kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 22:36:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #492 from aschulz90/mm-fixes

Browse Source 
Mm fixes
This commit is contained in:
Michael Teeuw 2016-10-31 20:39:00 +01:00 committed by GitHub
commit 094ef592a7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -32,7 +32,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- Solve an issue where module margins would appear when the first module of a section was hidden. - Solve an issue where module margins would appear when the first module of a section was hidden.
- Solved visual display errors on chrome, if all modules in one of the right sections are hidden - Solved visual display errors on chrome, if all modules in one of the right sections are hidden.
- Module default config values are no longer modified when setting config values.
## [2.0.5] - 2016-09-20 ## [2.0.5] - 2016-09-20

2
js/module.js
View File

@ -166,7 +166,7 @@ var Module = Class.extend({
* argument config obejct - Module config. * argument config obejct - Module config.
*/ */
setConfig: function (config) { setConfig: function (config) {
this.config = Object.assign(this.defaults, config); this.config = Object.assign({}, this.defaults, config);
}, },
/* socket() /* socket()