kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 21:00:57 +00:00
Code Issues Projects Releases Wiki Activity

changelog, linting

Browse Source
This commit is contained in:
fewieden
2018-02-17 10:17:59 +01:00
parent f414707f11
commit 1f873b93f6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -13,6 +13,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Allow to scroll in full page article view of default newsfeed module with gesture events from [MMM-Gestures](https://github.com/thobach/MMM-Gestures) - Allow to scroll in full page article view of default newsfeed module with gesture events from [MMM-Gestures](https://github.com/thobach/MMM-Gestures)
- Changed 'compliments.js' - update DOM if remote compliments are loaded instead of waiting one updateInterval to show custom compliments - Changed 'compliments.js' - update DOM if remote compliments are loaded instead of waiting one updateInterval to show custom compliments
### Changed
- Update notifications use now translation templates instead of normal strings.
### Fixed ### Fixed
- News article in fullscreen (iframe) is now shown in front of modules. - News article in fullscreen (iframe) is now shown in front of modules.

6
modules/default/updatenotification/updatenotification.js
View File

@@ -59,8 +59,8 @@ Module.register("updatenotification", {
message.appendChild(icon); message.appendChild(icon);
var subtextHtml = this.translate("UPDATE_INFO", { var subtextHtml = this.translate("UPDATE_INFO", {
COMMIT_COUNT: this.status.behind + " " + ((this.status.behind == 1) ? "commit" : "commits"), COMMIT_COUNT: this.status.behind + " " + ((this.status.behind == 1) ? "commit" : "commits"),
BRANCH_NAME: this.status.current BRANCH_NAME: this.status.current
}); });
var text = document.createElement("span"); var text = document.createElement("span");
@@ -69,7 +69,7 @@ Module.register("updatenotification", {
subtextHtml = this.diffLink(subtextHtml); subtextHtml = this.diffLink(subtextHtml);
} else { } else {
text.innerHTML = this.translate("UPDATE_NOTIFICATION_MODULE", { text.innerHTML = this.translate("UPDATE_NOTIFICATION_MODULE", {
MODULE_NAME: this.status.module MODULE_NAME: this.status.module
}); });
} }
message.appendChild(text); message.appendChild(text);