Preventing toasts to override global options

Fixes #54
Foxandxss · Mar 24, 2015 · 2ac9255 · 2ac9255
1 parent 9a87e11
commit 2ac9255
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 5 deletions.
diff --git a/dist/angular-toastr.js b/dist/angular-toastr.js
@@ -201,7 +201,7 @@
         };
         newToast.iconClass = map.iconClass;
         if (map.optionsOverride) {
-          options = angular.extend(options, map.optionsOverride);
+          options = angular.extend(options, cleanOptionsOverride(map.optionsOverride));
           newToast.iconClass = map.optionsOverride.iconClass || newToast.iconClass;
         }
 
@@ -210,6 +210,16 @@
         newToast.el = createToastEl(newToast.scope);
 
         return newToast;
+
+        function cleanOptionsOverride(options) {
+          var badOptions = ['containerId', 'iconClasses', 'maxOpened', 'newestOnTop',
+                            'positionClass', 'preventDuplicates'];
+          for (var i = 0, l = badOptions.length; i < l; i++) {
+            delete options[badOptions[i]];
+          }
+
+          return options;
+        }
       }
 
       function createToastEl(scope) {

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
@@ -201,7 +201,7 @@
         };
         newToast.iconClass = map.iconClass;
         if (map.optionsOverride) {
-          options = angular.extend(options, map.optionsOverride);
+          options = angular.extend(options, cleanOptionsOverride(map.optionsOverride));
           newToast.iconClass = map.optionsOverride.iconClass || newToast.iconClass;
         }
 
@@ -210,6 +210,16 @@
         newToast.el = createToastEl(newToast.scope);
 
         return newToast;
+
+        function cleanOptionsOverride(options) {
+          var badOptions = ['containerId', 'iconClasses', 'maxOpened', 'newestOnTop',
+                            'positionClass', 'preventDuplicates'];
+          for (var i = 0, l = badOptions.length; i < l; i++) {
+            delete options[badOptions[i]];
+          }
+
+          return options;
+        }
       }
 
       function createToastEl(scope) {

diff --git a/dist/angular-toastr.tpls.min.js b/dist/angular-toastr.tpls.min.js