Resolve #210 #204

needim · Sep 22, 2014 · a890c54 · a890c54
1 parent bb3c9b3
commit a890c54
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/demo/usingWithModal.html b/demo/usingWithModal.html
@@ -45,6 +45,7 @@
             text        : type,
             type        : type,
             dismissQueue: true,
+            closeWith   : ['click', 'backdrop'],
             modal       : true,
             layout      : 'topCenter',
             theme       : 'defaultTheme',

diff --git a/js/noty/jquery.noty.js b/js/noty/jquery.noty.js
@@ -171,10 +171,12 @@ if(typeof Object.create !== 'function') {
                     function() {
                         self.close.apply(self);
                     }
-                )
+                );
                 return;
             }
 
+            this.$bar.dequeue();
+
             if(!this.shown && !this.showing) { // If we are still waiting in the queue just delete from queue
                 var queue = [];
                 $.each($.noty.queue, function(i, n) {
@@ -370,6 +372,11 @@ if(typeof Object.create !== 'function') {
                 modal.css(notification.options.theme.modal.css);
 
             modal.prependTo($('body')).fadeIn('fast');
+
+            if($.inArray('backdrop', notification.options.closeWith) > -1)
+                modal.on('click', function(e) {
+                    $.noty.closeAll();
+                });
         }
     };
 

diff --git a/js/noty/packaged/jquery.noty.packaged.js b/js/noty/packaged/jquery.noty.packaged.js
@@ -171,10 +171,12 @@ if(typeof Object.create !== 'function') {
                     function() {
                         self.close.apply(self);
                     }
-                )
+                );
                 return;
             }
 
+            this.$bar.dequeue();
+
             if(!this.shown && !this.showing) { // If we are still waiting in the queue just delete from queue
                 var queue = [];
                 $.each($.noty.queue, function(i, n) {
@@ -370,6 +372,11 @@ if(typeof Object.create !== 'function') {
                 modal.css(notification.options.theme.modal.css);
 
             modal.prependTo($('body')).fadeIn('fast');
+
+            if($.inArray('backdrop', notification.options.closeWith) > -1)
+                modal.on('click', function(e) {
+                    $.noty.closeAll();
+                });
         }
     };