Merge branch 'develop'

Conflicts:
	build/toastr.min.js

Author: TimFerrell

CHANGELOG.md

@@ -1,4 +1,10 @@
+# 2.1.1 (2015-02-19)
 
+## New Features
+- Support for explicitly clearing a toast [jstawski](https://github.com/jstawski) | [PR 226](https://github.com/CodeSeven/toastr/pull/226)
+
+## Dev Ops
+- Refactor to use gulp
 
 # 2.1.0  (2014-10-15)
 

README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/CodeSeven/toastr.svg)](https://travis-ci.org/CodeSeven/toastr)
 
 ## Current Version
-2.1.0
+2.1.1
 
 ## Demo
 - Demo can be found at http://codeseven.github.io/toastr/demo.html
@@ -169,7 +169,7 @@ All pull requests are subject to approval by the repository owners, who have sol
 Inspired by https://github.com/Srirangan/notifer.js/.
 
 ## Copyright
-Copyright © 2012-2014 
+Copyright © 2012-2015
 
 ## License
 toastr is under MIT license - http://www.opensource.org/licenses/mit-license.php

build/toastr.js.map

@@ -56,7 +56,12 @@ <h1>toastr</h1>
                     </div>
                     <div class="controls">
                         <label class="checkbox" for="addClear">
-                            <input id="addClear" type="checkbox" value="checked" class="input-mini" />Add Clear Button
+                            <input id="addClear" type="checkbox" value="checked" class="input-mini" />Add button to force clearing a toast, ignoring focus
+                        </label>
+                    </div>
+                    <div class="controls">
+                        <label class="checkbox" for="newestOnTop">
+                            <input id="newestOnTop" type="checkbox" value="checked" class="input-mini" />Newest on top
                         </label>
                     </div>
                 </div>
@@ -193,9 +198,10 @@ <h2>Links</h2>
 
             return msgs[i];
         };
+
         var getMessageWithClearButton = function (msg) {
             msg = msg ? msg : 'Clear itself?';
-            msg += '<br /><br /><button type="button" class="clear">Yes</button>';
+            msg += '<br /><br /><button type="btn button" class="clear">Yes</button>';
             return msg;
         };
 
@@ -217,6 +223,7 @@ <h2>Links</h2>
             toastr.options = {
                 closeButton: $('#closeButton').prop('checked'),
                 debug: $('#debugInfo').prop('checked'),
+                newestOnTop: $('#newestOnTop').prop('checked'),
                 progressBar: $('#progressBar').prop('checked'),
                 positionClass: $('#positionGroup input:radio:checked').val() || 'toast-top-right',
                 preventDuplicates: $('#preventDuplicates').prop('checked'),

build/toastr.min.js

@@ -52,9 +52,9 @@ gulp.task('js', function() {
         .pipe(plug.bytediff.stop(bytediffFormatter))
         .pipe(plug.sourcemaps.write('/'))
         .pipe(plug.rename(function(path) {
-          if(path.extname === ".js") {
-            path.basename += ".min"
-          }
+            if (path.extname === '.js') {
+                path.basename += '.min';
+            }
         }))
         .pipe(gulp.dest(paths.build));
 });

demo.html

@@ -3,7 +3,7 @@
   "filename": "js/toastr.min.js",
   "main": "toastr.js",
   "style": "./toastr.min.css",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "ToastrJS is a JavaScript library for Gnome / Growl type non-blocking notifications. jQuery is required. The goal is to create a simple core library that can be customized and extended.",
   "homepage": "http://www.toastrjs.com",
   "keywords": [