Skip to content

Commit

Permalink
Merge pull request #297 from mikaelbr/updates-after-notifu
Browse files Browse the repository at this point in the history
Updates after notifu
  • Loading branch information
jnielson94 committed Nov 15, 2019
2 parents ac37b83 + b22f51d commit 99a7984
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 3 deletions.
8 changes: 5 additions & 3 deletions README.md
Expand Up @@ -52,7 +52,7 @@ npm install --save node-notifier

Standard usage, with cross-platform fallbacks as defined in the
[reporter flow chart](./DECISION_FLOW.md). All of the options
below will work in some way or another on all platforms.
below will work in some way or another on most platforms.

```javascript
const notifier = require('node-notifier');
Expand All @@ -64,7 +64,7 @@ notifier.notify(
message: 'Hello from node, Mr. User!',
icon: path.join(__dirname, 'coulson.jpg'), // Absolute path (doesn't work on balloons)
sound: true, // Only Notification Center or Windows Toasters
wait: true // Wait with callback, until user action is taken against notification, does not apply to Windows Toasters as they always wait
wait: true // Wait with callback, until user action is taken against notification, does not apply to Windows Toasters as they always wait or notify-send as it does not support the wait option
},
function(err, response) {
// Response is response from notification
Expand Down Expand Up @@ -443,7 +443,9 @@ node: {

## License

[MIT License](http://en.wikipedia.org/wiki/MIT_License)
This package is licensed using the [MIT License](http://en.wikipedia.org/wiki/MIT_License).

[SnoreToast](https://raw.githubusercontent.com/mikaelbr/node-notifier/master/vendor/snoreToast/LICENSE) and [Notifu](https://raw.githubusercontent.com/mikaelbr/node-notifier/master/vendor/notifu/LICENSE) have licenses in their vendored versions which do not match the MIT license, LGPL-3 and BSD 3-Clause to be specific. We are not lawyers, but have made our best efforts to conform to the terms in those licenses while releasing this package using the license we chose.

[npm-url]: https://npmjs.org/package/node-notifier
[npm-image]: http://img.shields.io/npm/v/node-notifier.svg?style=flat
Expand Down
9 changes: 9 additions & 0 deletions example/forceBallon.js
@@ -0,0 +1,9 @@
const notifier = require('../index');
const balloon = notifier.WindowsBalloon();
balloon
.notify({ message: 'Hello' }, function(err, data) {
console.log(err, data);
})
.on('click', function() {
console.log(arguments);
});
1 change: 1 addition & 0 deletions notifiers/balloon.js
Expand Up @@ -14,6 +14,7 @@ Usage
/q Do not play a sound when the tooltip is displayed
/w Show the tooltip even if the user is in the quiet period that follows his very first login (Windows 7 and up)
/xp Use IUserNotification interface event when IUserNotification2 is available
/l Display license for notifu
// Kill codes:
2 = Timeout
Expand Down
25 changes: 25 additions & 0 deletions vendor/notifu/LICENSE
@@ -0,0 +1,25 @@
// Retrieved from notifu 1.7.0 ( http://www.paralint.com/projects/notifu/index.html )
Copyright (c) 2019, Solutions Paralint inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1 change: 1 addition & 0 deletions vendor/snoreToast/LICENSE
@@ -1,3 +1,4 @@
// Retrieved from https://github.com/KDE/snoretoast/blob/master/COPYING.LGPL-3 version 0.7.0
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Expand Down

0 comments on commit 99a7984

Please sign in to comment.