kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1958 from bugsounet/master

Browse Source 
issue #1956
This commit is contained in:
Michael Teeuw 2020-03-19 19:17:03 +01:00 committed by GitHub
commit fe1c5df9d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/main.js
View File

@ -306,7 +306,9 @@ var MM = (function() {
module.showHideTimer = setTimeout(function() { module.showHideTimer = setTimeout(function() {
if (typeof callback === "function") { callback(); } if (typeof callback === "function") { callback(); }
}, speed); }, speed);
} else {
// invoke callback
if (typeof callback === "function") { callback(); }
} }
}; };

7
js/module.js
View File

@ -417,8 +417,11 @@ var Module = Class.extend({
callback = callback || function () { }; callback = callback || function () { };
options = options || {}; options = options || {};
this.resume(); var self = this;
MM.showModule(this, speed, callback, options); MM.showModule(this, speed, function () {
self.resume();
callback;
}, options);
} }
}); });