Added preventOpenDuplicates global option. The option prevents toasts…

… that are currently open from having duplicates. Also fixed typo in documentation: extendedTimeOut. Closes #89
Foxandxss · May 20, 2015 · e1bdd4e · e1bdd4e
1 parent 52d0508
commit e1bdd4e
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -133,6 +133,7 @@ app.config(function(toastrConfig) {
     onShown: null,
     positionClass: 'toast-top-right',
     preventDuplicates: false,
+    preventOpenDuplicates: false,
     progressBar: false,
     tapToDismiss: true,
     target: 'body',
@@ -163,6 +164,7 @@ Those are the default values, you can pick what you need from it and override wi
 * **onShown**: A callback function called when a toast is shown.
 * **positionClass**: The position where the toasts are added.
 * **preventDuplicates**: Prevent duplicates of the last toast.
+* **preventOpenDuplicates**: Prevent duplicates of open toasts.
 * **progressBar**: A progress bar to see the timeout in real time.
 * **tapToDismiss**: Whether the toast should be dismissed when it is clicked.
 * **target**: The element to put the toastr container.
@@ -234,7 +236,7 @@ There you can override:
 * **allowHtml**: Whether to allow HTML or not in a concrete toast.
 * **closeButton**: Putting a close button on the toast.
 * **closeHtml**: If you need to override how the close button looks like.
-* **extendedTimeout**: The timeout after you hover it.
+* **extendedTimeOut**: The timeout after you hover it.
 * **iconClass**: For the type class you want to use for the toast.
 * **messageClass**: If you want to modify the message look.
 * **onHidden**: Function to call when the toast gets hidden.

diff --git a/dist/angular-toastr.js b/dist/angular-toastr.js
@@ -12,6 +12,7 @@
     var toasts = [];
 
     var previousToastMessage = '';
+    var openToasts = {};
 
     var containerDefer = $q.defer();
 
@@ -69,6 +70,7 @@
           }
           toast.scope.$destroy();
           var index = toasts.indexOf(toast);
+          delete openToasts[toast.scope.message];
           toasts.splice(index, 1);
           var maxOpened = toastrConfig.maxOpened;
           if (maxOpened && toasts.length >= maxOpened) {
@@ -225,7 +227,7 @@
 
         function cleanOptionsOverride(options) {
           var badOptions = ['containerId', 'iconClasses', 'maxOpened', 'newestOnTop',
-                            'positionClass', 'preventDuplicates', 'templates'];
+                            'positionClass', 'preventDuplicates', 'preventOpenDuplicates', 'templates'];
           for (var i = 0, l = badOptions.length; i < l; i++) {
             delete options[badOptions[i]];
           }
@@ -245,14 +247,17 @@
       }
 
       function shouldExit() {
-        if (options.preventDuplicates) {
-          if (map.message === previousToastMessage) {
-            return true;
-          } else {
-            previousToastMessage = map.message;
-          }
-          return false;
+        var isDuplicateOfLast = options.preventDuplicates && map.message === previousToastMessage;
+        var isDuplicateOpen = options.preventOpenDuplicates && openToasts[map.message];
+
+        if (isDuplicateOfLast || isDuplicateOpen) {
+          return true;
         }
+
+        previousToastMessage = map.message;
+        openToasts[map.message] = true;
+
+        return false;
       }
     }
   }

diff --git a/dist/angular-toastr.min.js b/dist/angular-toastr.min.js
diff --git a/dist/angular-toastr.tpls.js b/dist/angular-toastr.tpls.js
@@ -12,6 +12,7 @@
     var toasts = [];
 
     var previousToastMessage = '';
+    var openToasts = {};
 
     var containerDefer = $q.defer();
 
@@ -69,6 +70,7 @@
           }
           toast.scope.$destroy();
           var index = toasts.indexOf(toast);
+          delete openToasts[toast.scope.message];
           toasts.splice(index, 1);
           var maxOpened = toastrConfig.maxOpened;
           if (maxOpened && toasts.length >= maxOpened) {
@@ -225,7 +227,7 @@
 
         function cleanOptionsOverride(options) {
           var badOptions = ['containerId', 'iconClasses', 'maxOpened', 'newestOnTop',
-                            'positionClass', 'preventDuplicates', 'templates'];
+                            'positionClass', 'preventDuplicates', 'preventOpenDuplicates', 'templates'];
           for (var i = 0, l = badOptions.length; i < l; i++) {
             delete options[badOptions[i]];
           }
@@ -245,14 +247,17 @@
       }
 
       function shouldExit() {
-        if (options.preventDuplicates) {
-          if (map.message === previousToastMessage) {
-            return true;
-          } else {
-            previousToastMessage = map.message;
-          }
-          return false;
+        var isDuplicateOfLast = options.preventDuplicates && map.message === previousToastMessage;
+        var isDuplicateOpen = options.preventOpenDuplicates && openToasts[map.message];
+
+        if (isDuplicateOfLast || isDuplicateOpen) {
+          return true;
         }
+
+        previousToastMessage = map.message;
+        openToasts[map.message] = true;
+
+        return false;
       }
     }
   }