kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Use SHOW_ALERT for all type of notifications

Browse Source
This commit is contained in:
Paul-Vincent Roll 2016-04-03 20:28:51 +02:00
parent 7f2537f9b1
commit a55a2bcca0
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/default/alert/README.md
View File

@ -70,11 +70,18 @@ The following properties can be configured:
## Developer notes ## Developer notes
For notifications use:
### Display notification
``` ```
self.sendNotification("SHOW_NOTIFICATION", {title: "Hello", message: "This is a test!"}); self.sendNotification("SHOW_ALERT", {type: "notification"});
``` ```
For alerts use:
```
self.sendNotification("SHOW_ALERT", {type: "alert"});
```
### Notification params
<table width="100%"> <table width="100%">
<!-- why, markdown... --> <!-- why, markdown... -->
<thead> <thead>
@ -99,10 +106,7 @@ self.sendNotification("SHOW_NOTIFICATION", {title: "Hello", message: "This is a
</tbody> </tbody>
</table> </table>
### Display alert ### Alert params
```
self.sendNotification("SHOW_ALERT", {title: "Hello", message: "This is a test!", imageUrl:"url", imageHeight: "30px", timer:2});
```
<table width="100%"> <table width="100%">
<!-- why, markdown... --> <!-- why, markdown... -->
<thead> <thead>
@ -149,8 +153,6 @@ self.sendNotification("SHOW_ALERT", {title: "Hello", message: "This is a test!",
</tbody> </tbody>
</table> </table>
## Open Source Licenses ## Open Source Licenses
###[NotificationStyles](https://github.com/codrops/NotificationStyles) ###[NotificationStyles](https://github.com/codrops/NotificationStyles)
See [ympanus.net](http://tympanus.net/codrops/licensing/) for license. See [ympanus.net](http://tympanus.net/codrops/licensing/) for license.

23
modules/default/alert/alert.js
View File

@ -14,7 +14,7 @@ Module.register('alert',{
// scale|slide|genie|jelly|flip|bouncyflip|exploader // scale|slide|genie|jelly|flip|bouncyflip|exploader
alert_effect:"jelly", alert_effect:"jelly",
//time a notification is displayed in seconds //time a notification is displayed in seconds
display_time: 3.5, display_time: 3500,
//Position //Position
position: "center", position: "center",
//shown at startup //shown at startup
@ -32,18 +32,13 @@ Module.register('alert',{
message : message, message : message,
layout : "growl", layout : "growl",
effect : this.config.effect, effect : this.config.effect,
ttl: this.config.display_time * 1000 ttl: this.config.display_time
}).show(); }).show();
}, },
show_alert: function (params, sender) { show_alert: function (params, sender) {
var self = this var self = this
//Set standard params if not provided by module //Set standard params if not provided by module
if (typeof params.timer === 'undefined') { if (typeof params.timer === 'undefined') { params.timer = null; }
params.timer = null;
}
else {
params.timer = params.timer * 1000
}
if (typeof params.imageHeight === 'undefined') { params.imageHeight = "80px"; } if (typeof params.imageHeight === 'undefined') { params.imageHeight = "80px"; }
if (typeof params.imageUrl === 'undefined') { if (typeof params.imageUrl === 'undefined') {
params.imageUrl = null; params.imageUrl = null;
@ -99,11 +94,13 @@ Module.register('alert',{
}, },
notificationReceived: function(notification, payload, sender) { notificationReceived: function(notification, payload, sender) {
if (notification === 'SHOW_NOTIFICATION') { if (notification === 'SHOW_ALERT') {
this.show_notification(payload) if (payload.type == "alert"){
} this.show_alert(payload, sender)
else if (notification === 'SHOW_ALERT') { }
this.show_alert(payload, sender) else if (payload.type = "notification"){
this.show_notification(payload)
}
} }
else if (notification === 'HIDE_ALERT') { else if (notification === 'HIDE_ALERT') {
this.hide_alert(sender) this.hide_alert(sender)