v2.3.6

needim · Aug 13, 2015 · e3b341e · e3b341e
1 parent 5b12629
commit e3b341e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name"       : "noty",
-    "version"    : "2.3.5",
+    "version"    : "2.3.6",
     "main"       : "js/noty/packaged/jquery.noty.packaged.js",
     "ignore"     : [],
     "authors"    : [

diff --git a/js/noty/jquery.noty.js b/js/noty/jquery.noty.js
@@ -1,6 +1,6 @@
 /*!
  @package noty - jQuery Notification Plugin
- @version version: 2.3.5
+ @version version: 2.3.6
  @contributors https://github.com/needim/noty/graphs/contributors
 
  @documentation Examples and Documentation - http://needim.github.com/noty/

diff --git a/js/noty/packaged/jquery.noty.packaged.js b/js/noty/packaged/jquery.noty.packaged.js
@@ -10,7 +10,7 @@
 
 /*!
  @package noty - jQuery Notification Plugin
- @version version: 2.3.5
+ @version version: 2.3.6
  @contributors https://github.com/needim/noty/graphs/contributors
 
  @documentation Examples and Documentation - http://needim.github.com/noty/
@@ -83,6 +83,7 @@
 
                 $.each(this.options.buttons, function(i, button) {
                     var $button = $('<button/>').addClass((button.addClass) ? button.addClass : 'gray').html(button.text).attr('id', button.id ? button.id : 'button-' + i)
+                        .attr('title', button.title)
                         .appendTo(self.$bar.find('.noty_buttons'))
                         .on('click', function(event) {
                             if($.isFunction(button.onClick)) {
@@ -114,7 +115,7 @@
 
             self.$bar.addClass(self.options.layout.addClass);
 
-            self.options.layout.container.style.apply($(self.options.layout.container.selector));
+            self.options.layout.container.style.apply($(self.options.layout.container.selector), [self.options.within]);
 
             self.showing = true;
 
@@ -169,9 +170,9 @@
 
             // If noty is have a timeout option
             if(self.options.timeout)
-                setTimeout(function() {
+                self.$bar.delay(self.options.timeout).promise().done(function() {
                     self.close();
-                }, self.options.timeout);
+                });
 
             return this;
 
@@ -237,7 +238,7 @@
             // Modal Cleaning
             if(self.options.modal) {
                 $.notyRenderer.setModalCount(-1);
-                if($.notyRenderer.getModalCount() == 0) $('.noty_modal').fadeOut('fast', function() {
+                if($.notyRenderer.getModalCount() == 0) $('.noty_modal').fadeOut(self.options.animation.fadeSpeed, function() {
                     $(this).remove();
                 });
             }
@@ -354,7 +355,7 @@
         if($.type(instance) === 'object') {
             if(instance.options.dismissQueue) {
                 if(instance.options.maxVisible > 0) {
-                    if($(instance.options.layout.container.selector + ' li').length < instance.options.maxVisible) {
+                    if($(instance.options.layout.container.selector + ' > li').length < instance.options.maxVisible) {
                         $.notyRenderer.show($.noty.queue.shift());
                     }
                     else {
@@ -415,7 +416,7 @@
             if(notification.options.theme.modal && notification.options.theme.modal.css)
                 modal.css(notification.options.theme.modal.css);
 
-            modal.prependTo($('body')).fadeIn('fast');
+            modal.prependTo($('body')).fadeIn(self.options.animation.fadeSpeed);
 
             if($.inArray('backdrop', notification.options.closeWith) > -1)
                 modal.on('click', function(e) {
@@ -509,7 +510,8 @@
             open  : {height: 'toggle'},
             close : {height: 'toggle'},
             easing: 'swing',
-            speed : 500
+            speed : 500,
+            fadeSpeed: 'fast',
         },
         timeout     : false,
         force       : false,
@@ -1433,4 +1435,4 @@ $.noty.themes.relax = {
 
 return window.noty;
 
-});
+});
diff --git a/js/noty/packaged/jquery.noty.packaged.min.js b/js/noty/packaged/jquery.noty.packaged.min.js
diff --git a/noty.jquery.json b/noty.jquery.json
@@ -1,6 +1,6 @@
 {
     "name"        : "noty",
-    "version"     : "2.3.5",
+    "version"     : "2.3.6",
     "title"       : "noty - a jquery notification plugin",
     "description" : "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
     "keywords"    : ["noty", "notification", "plugin", "jquery", "javascript", "alert", "error", "warning", "information", "confirmation"],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "noty",
-	"version": "2.3.5",
+	"version": "2.3.6",
 	"title": "noty - a jquery notification plugin",
 	"description": "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
 	"homepage": "http://needim.github.com/noty",