Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

invoke callback for suspend notification, even if no dom content #1309

Merged
merged 8 commits into from
Jun 8, 2018
Merged

invoke callback for suspend notification, even if no dom content #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
848f94b
invoke callback for suspend notification, even if no dom content
sdetweil Jun 7, 2018
11238d6
fix tabs
sdetweil Jun 7, 2018
1813562
update changelog
sdetweil Jun 7, 2018
c3f03e3
fix changelog
sdetweil Jun 7, 2018
54443b0
Revert "fix changelog"
sdetweil Jun 7, 2018
1e4b759
Merge branch 'develop' into fix_suspend
MichMich Jun 7, 2018
add7b44
Style change.
MichMich Jun 7, 2018
23ac721
remove trailing spaces from reformatted else
sdetweil Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

=======
## [2.4.0] - Unreleased (Current Develop Branch)

*This release is scheduled to be released on 2018-07-01.*
Expand All @@ -24,6 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Changed
- Upgrade to Electron 2.0.0.
- Remove yarn-or-npm which breaks production builds.
- Invoke module suspend even if no dom content. [#1308](https://github.com/MichMich/MagicMirror/issues/1308)

### Fixed
- Fixed issue where wind chill could not be displayed in Fahrenheit. [#1247](https://github.com/MichMich/MagicMirror/issues/1247)
Expand Down
3 changes: 3 additions & 0 deletions js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ var MM = (function() {

if (typeof callback === "function") { callback(); }
}, speed);
} else {
// invoke callback even if no content, issue 1308
if (typeof callback === "function") { callback(); }
}
};

Expand Down