Closes #108.

Confirmed that clicking the close button in some browsers (FireFox, IE10) was not closing the toast. The problem was that the focus was still on the toast, and we want to toast to hang around normally when it has focus. So we need the focus code. But when we click the close button, now we explictly tell it to ignore the focus code.
CodeSeven · Sep 5, 2013 · a7d5d3e · a7d5d3e
1 parent fb34ff9
commit a7d5d3e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/tests/toastr.js b/tests/toastr.js
@@ -209,10 +209,14 @@
                 if (!options.onclick && options.tapToDismiss) {
                     $toastElement.click(hideToast);
                 }
+				if(options.closeButton && $closeElement){
+					$closeElement.click(function(){ hideToast(true); });
+				}
 
                 if (options.onclick) {
                     $toastElement.click(function () {
-                        options.onclick() && hideToast();
+                        options.onclick();
+                        hideToast();
                     });
                 }
 
@@ -224,8 +228,8 @@
 
                 return $toastElement;
 
-                function hideToast() {
-                    if ($(':focus', $toastElement).length > 0) {
+                function hideToast(override) {
+                    if ($(':focus', $toastElement).length && !override) {
                         return;
                     }
                     return $toastElement[options.hideMethod]({

diff --git a/toastr.js b/toastr.js
@@ -209,10 +209,14 @@
                 if (!options.onclick && options.tapToDismiss) {
                     $toastElement.click(hideToast);
                 }
+				if(options.closeButton && $closeElement){
+					$closeElement.click(function(){ hideToast(true); });
+				}
 
                 if (options.onclick) {
                     $toastElement.click(function () {
-                        options.onclick() && hideToast();
+                        options.onclick();
+                        hideToast();
                     });
                 }
 
@@ -224,8 +228,8 @@
 
                 return $toastElement;
 
-                function hideToast() {
-                    if ($(':focus', $toastElement).length > 0) {
+                function hideToast(override) {
+                    if ($(':focus', $toastElement).length && !override) {
                         return;
                     }
                     return $toastElement[options.hideMethod]({

diff --git a/toastr.min.js b/toastr.min.js