Merge branch 'master' into overwritable-timeout

mikaelbr · Aug 4, 2019 · 698c103 · 698c103
2 parents 4686c9c + fd851c8
commit 698c103
Show file tree

Hide file tree

Showing 8 changed files with 2,520 additions and 2,953 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -6,6 +6,7 @@
   },
   "rules": {
     "space-before-function-paren": 0,
+    "no-prototype-builtins": 0,
     "no-control-regex": 0
   }
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: node_js
 node_js:
-  - "node"
-  - "10"
-  - "8"
-  - "6"
-install: npm install
+  - 'node'
+  - '10'
+  - '8'
+install: npm install
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### `v5.4.2`
+
+- Updates dependencies
+
+### `v5.4.1`
+
+- Revers changes to default timeout as they are causing some issues. See [#271](https://github.com/mikaelbr/node-notifier/pull/271)
+
 ### `v5.4.0`
 
 - Prevent Spotlight from indexing terminal-notifier.app ([#238](https://github.com/mikaelbr/node-notifier/pull/238))

diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ notifier.notify(
   }
 );
 
-notifier.on('click', function(notifierObject, options) {
+notifier.on('click', function(notifierObject, options, event) {
   // Triggers if `wait: true` and user clicks notification
 });