From 9c78af65e150703b0e5602c11854dd457775251f Mon Sep 17 00:00:00 2001 From: Paul-Vincent Roll Date: Sat, 2 Apr 2016 04:17:58 +0200 Subject: [PATCH] Added new option and licenses --- modules/default/alert/README.md | 44 ++++++++++++++++++++----- modules/default/alert/alert.js | 19 ++++++----- modules/default/alert/notificationFx.js | 2 +- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/modules/default/alert/README.md b/modules/default/alert/README.md index f28de111..0451104c 100644 --- a/modules/default/alert/README.md +++ b/modules/default/alert/README.md @@ -9,14 +9,15 @@ modules: [ { module: 'alert', config: { - // The config property is optional. - // layout type: growl|attached|bar|other - layout: "growl", - // effects for the specified layout: - // for growl layout: scale|slide|genie|jelly - // for attached layout: flip|bouncyflip - // for bar layout: slidetop|exploader + // style type: growl|attached|bar + style: "growl", + // effects for the specified style: + // for growl style: scale|slide|genie|jelly + // for attached style: flip|bouncyflip + // for bar style: slidetop|exploader effect: "slide", + //time a notification is displayed + display_time: 3500, //shown at startup welcome_message: "Welcome, start was successfull!" } @@ -35,4 +36,31 @@ self.sendNotification("SHOW_NOTIFICATION", message); ``` self.sendNotification("SHOW_ALERT", {title: "Hello", message: "This is a test!", type: "success", imageUrl:"url", imageSize: "50x50", timer:1000}); ``` -All parameters exept for `title` and `message` are optional. Possible types are `error`, `warning`, `info` and `success`. If you do not use the `timer` parameter, it is your responsibility to manually hide the alert by using `self.sendNotification("HIDE_ALERT");`! \ No newline at end of file +All parameters exept for `title` and `message` are optional. Possible types are `error`, `warning`, `info` and `success`. If you do not use the `timer` parameter, it is your responsibility to manually hide the alert by using `self.sendNotification("HIDE_ALERT");`! + +##Open Source Licenses +###[SweetAlert](http://t4t5.github.io/sweetalert/) +The MIT License (MIT) + +Copyright (c) 2014 Tristan Edwards + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +###[NotificationStyles](https://github.com/codrops/NotificationStyles) +See [ympanus.net](http://tympanus.net/codrops/licensing/) for license. \ No newline at end of file diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index 789f9a55..03e54a75 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -9,13 +9,15 @@ Module.register('alert',{ defaults: { - // layout type: growl|attached|bar - layout: "growl", - // effects for the specified layout: - // for growl layout: scale|slide|genie|jelly - // for attached layout: flip|bouncyflip - // for bar layout: slidetop|exploader + // style type: growl|attached|bar + style: "growl", + // effects for the specified style: + // for growl style: scale|slide|genie|jelly + // for attached style: flip|bouncyflip + // for bar style: slidetop|exploader effect: "slide", + //time a notification is displayed + display_time: 3500, //shown at startup welcome_message: "Welcome, start was successfull!" }, @@ -32,10 +34,9 @@ Module.register('alert',{ } this.alert = new NotificationFx({ message : message, - layout : this.config.layout, + layout : this.config.style, effect : this.config.effect, - type : 'notice', - ttl: 6000 + ttl: this.config.display_time }); this.alert.show() }, diff --git a/modules/default/alert/notificationFx.js b/modules/default/alert/notificationFx.js index f620a1f0..17438b79 100644 --- a/modules/default/alert/notificationFx.js +++ b/modules/default/alert/notificationFx.js @@ -63,7 +63,7 @@ effect : 'slide', // notice, warning, error, success // will add class ns-type-warning, ns-type-error or ns-type-success - type : 'error', + type : 'notice', // if the user doesn´t close the notification then we remove it // after the following time ttl : 6000,