Adds the toast as a parameter in all events

Fixes #138

Author: Foxandxss

README.md

@@ -176,16 +176,23 @@ app.config(function(toastrConfig) {
 * **extraData**: If you override the template, you can pass global extra data to your toasts.
 * **iconClasses**: The default type classes for the different toasts.
 * **messageClass**: The class for the toast's message.
-* **onHidden**: A callback function called when a toast gets hidden. It receives a boolean parameter to see whether it was closed via click or not.
-* **onShown**: A callback function called when a toast is shown.
-* **onTap**: A callback function called when it is clicked.
 * **progressBar**: A progress bar to see the timeout in real time.
 * **tapToDismiss**: Whether the toast should be dismissed when it is clicked.
 * **templates**: To override the default path of the templates.
 * **timeOut**: The timeout before the toasts disappear.
 * **titleClass**: The class for the toast's title.
 * **toastClass**: Base class for toasts.
 
+Toasts have 3 different events:
+
+* **onHidden**: A callback function called when a toast gets hidden. 
+	* First parameter: A boolean to see whether or not the toast was closed via click.
+	* Second parameter: The whole toast that got hidden.
+* **onShown**: A callback function called when a toast is shown.
+	* First parameter: The whole toast that got shown.
+* **onTap**: A callback function called when it is clicked.
+	* First parameter: The whole toast that got clicked.
+
 The second option is to pass a third parameter (or second if you don't need a **title**). Let see some examples:
 
 Toast with custom HTML (available in both title and message):

src/toastr.js

@@ -69,7 +69,7 @@
         toast.isOpened = false;
         $animate.leave(toast.el).then(function() {
           if (toast.scope.options.onHidden) {
-            toast.scope.options.onHidden(wasClicked);
+            toast.scope.options.onHidden(!!wasClicked, toast);
           }
           toast.scope.$destroy();
           var index = toasts.indexOf(toast);
@@ -101,8 +101,7 @@
     }
 
     /* Internal functions */
-    function _buildNotification(type, message, title, optionsOverride)
-    {
+    function _buildNotification(type, message, title, optionsOverride) {
       if (angular.isObject(title)) {
         optionsOverride = title;
         title = null;
@@ -201,8 +200,8 @@
           extendedTimeOut: options.extendedTimeOut,
           messageClass: options.messageClass,
           onHidden: options.onHidden,
-          onShown: options.onShown,
-          onTap: options.onTap,
+          onShown: generateEvent('onShown'),
+          onTap: generateEvent('onTap'),
           progressBar: options.progressBar,
           tapToDismiss: options.tapToDismiss,
           timeOut: options.timeOut,
@@ -213,6 +212,14 @@
         if (options.closeButton) {
           toast.scope.options.closeHtml = options.closeHtml;
         }
+
+        function generateEvent(event) {
+          if (options[event]) {
+            return function() {
+              options[event](toast);
+            };
+          }
+        }
       }
 
       function createToast() {

test/toastr_spec.js

@@ -724,58 +724,49 @@ describe('toastr', function() {
   describe('callbacks', function() {
     it('calls the onShown callback when showing a toast', function() {
       var callback = jasmine.createSpy();
-      openToasts(1, { onShown: callback });
-      expect(callback).toHaveBeenCalled();
+      var toast = openToast('success', 'A toast', { onShown: callback });
+      expect(callback).toHaveBeenCalledWith(toast);
     });
 
     it('calls the onHidden callback after a toast is closed on click', function() {
       var callback = jasmine.createSpy();
-      openToasts(1, { onHidden: callback });
+      var toast = openToast('success', 'A toast', { onHidden: callback });
       expect(callback).not.toHaveBeenCalled();
       clickToast();
-      expect(callback).toHaveBeenCalled();
+      expect(callback).toHaveBeenCalledWith(true, toast);
     });
 
     it('calls the onHidden callback after a toast is closed by timeout', function() {
       var callback = jasmine.createSpy();
-      openToasts(1, { onHidden: callback });
+      var toast = openToast('success', 'A toast', { onHidden: callback });
       expect(callback).not.toHaveBeenCalled();
       intervalFlush();
       animationFlush();
-      expect(callback).toHaveBeenCalled();
-    });
-
-    it('calls the onHidden callback with "true" if was hidden by click', function() {
-      var callback = jasmine.createSpy();
-      openToasts(1, { onHidden: callback });
-      expect(callback).not.toHaveBeenCalled();
-      clickToast();
-      animationFlush();
-      expect(callback).toHaveBeenCalledWith(true);
+      expect(callback).toHaveBeenCalledWith(false, toast);
     });
 
     it('calls the onHidden callback with "true" if the button was clicked', function() {
       var callback = jasmine.createSpy();
-      openToast('info', 'I have a button', {
+      var toast = openToast('info', 'I have a button', {
         onHidden: callback,
         closeButton: true
       });
       clickToastCloseButton();
-      expect(callback).toHaveBeenCalledWith(true);
+      expect(callback).toHaveBeenCalledWith(true, toast);
     });
 
     it('can call the callbacks even if the title is set to null', function() {
       var callback = jasmine.createSpy();
-      openToast('success', 'some message', null, {onShown: callback});
-      expect(callback).toHaveBeenCalled();
+      var toast = openToast('success', 'some message', null, {onShown: callback});
+      expect(callback).toHaveBeenCalledWith(toast);
     });
 
     it('calls the onTap callback when toast is clicked', function() {
       var callback = jasmine.createSpy();
-      openToasts(1, { onTap: callback });
+      var toast = openToast('success', 'A toast', { onTap: callback });
       expect(callback).not.toHaveBeenCalled();
       clickToast();
-      expect(callback).toHaveBeenCalled();
+      expect(callback).toHaveBeenCalledWith(toast);
     });
   });