Merge pull request #284 from mikaelbr/revert-271-overwritable-timeout

Revert "Allow timeout: false to remove a timeout"

README.md

@@ -186,7 +186,11 @@ notifier.notify(
 **Note:** The `wait` option is shorthand for `timeout: 5`. This just sets a timeout
 for 5 seconds. It does _not_ make the notification sticky!
 
-As of 5.4.0, `timeout` defaults to `10`. In order to have a "fire and forgotten" notification, you need to set `timeout` to `false`.
+Without `wait` or `timeout`, notifications are just fired and forgotten. They don't
+wait for any response.
+
+To make notifications wait for a response (like activation/click), you must define
+a `timeout`.
 
 _Exception:_ If `reply` is defined, it's recommended to set `timeout` to a either
 high value, or to nothing at all.

lib/utils.js

@@ -210,14 +210,6 @@ module.exports.mapToMac = function(options) {
     delete options.wait;
   }
 
-  if (!options.wait && !options.timeout) {
-    if (options.timeout === false) {
-      delete options.timeout;
-    } else {
-      options.timeout = 10;
-    }
-  }
-
   options.json = true;
   return options;
 };

test/terminal-notifier.js

@@ -277,28 +277,6 @@ describe('terminal-notifier', function() {
       });
     });
 
-    it('should not set a default timeout if explicitly false', function(done) {
-      var expected = [
-        '-title',
-        '"Title"',
-        '-message',
-        '"Message"',
-        '-json',
-        '"true"'
-      ];
-
-      expectArgsListToBe(expected, done);
-      var notifier = new NotificationCenter();
-      notifier.isNotifyChecked = true;
-      notifier.hasNotifier = true;
-
-      notifier.notify({
-        title: 'Title',
-        message: 'Message',
-        timeout: false
-      });
-    });
-
     it('should escape all title and message', function(done) {
       var expected = [
         '-title',