Merge pull request #328 from CodeSeven/develop

Bracing for 2.1.2 release

Author: johnpapa

.jshintrc

@@ -56,6 +56,8 @@
 
     "globals": {
         "angular": false,
-        "$": false
+        "$": false,
+        "module": false,
+        "require": false
     }
-}
+}

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 2.1.2 (2015-08-06)
+
+## New Features
+- Added HTML escaping (use toastr.options.escapeHTML)
+- Added more options for overriding animations, specifically to closing a toast
+- Events are now passed into the onClick handler of the toast
+
+## Bug Fixes
+- Resolved issue with centered toasts that would override top and bottom margins
+
+## Dev Ops
+- Removed `module` and `require` from the `.jshintrc` file
+- Cleaned up the readme
+- Builds moved to the `builds` folder
+- Made href calls relative to the transport in the demo
+- CSS is now built by the included LESS file as part of a `gulp` call
+- Removed un-used deps
+
 # 2.1.1 (2015-02-19)
 
 ## New Features

README.md

@@ -4,13 +4,13 @@
 [![Build Status](https://travis-ci.org/CodeSeven/toastr.svg)](https://travis-ci.org/CodeSeven/toastr)
 
 ## Current Version
-2.1.1
+2.1.2
 
 ## Demo
 - Demo can be found at http://codeseven.github.io/toastr/demo.html
 - [Demo using FontAwesome icons with toastr](http://plnkr.co/edit/6W9URNyyp2ItO4aUWzBB?p=preview)
 
-## CDNjs
+## [CDNjs](https://cdnjs.com/libraries/toastr.js)
 Toastr is hosted at CDN JS
 
 #### Debug
@@ -20,13 +20,23 @@ Toastr is hosted at CDN JS
 #### Minified
 - [//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js](//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js) 
 - [//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css](//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css)
+ 
+## Install
 
-## NuGet Gallery
-http://nuget.org/packages/toastr
+#### [NuGet Gallery](http://nuget.org/packages/toastr)
+```
+Install-Package toastr
+```
 
-## [Bower](http://bower.io/)
-		bower install toastr
+#### [Bower](http://bower.io/search/?q=toastr)
+```
+bower install toastr
+```
 
+#### [npm](https://www.npmjs.com/package/toastr)
+```
+npm install --save toastr
+```
 
 ## Wiki and Change Log
 [Wiki including Change Log](https://github.com/CodeSeven/toastr/wiki)
@@ -43,95 +53,124 @@ The following animations options have been deprecated and should be replaced:
 
 ## Quick Start
 
-###3 Easy Steps
+### 3 Easy Steps
 For other API calls, see the [demo](http://codeseven.github.io/toastr/demo.html).
 
 1. Link to toastr.css `<link href="toastr.css" rel="stylesheet"/>`
 
 2. Link to toastr.js `<script src="toastr.js"></script>`
 
 3. use toastr to display a toast for info, success, warning or error
-
-		// Display an info toast with no title
-		toastr.info('Are you the 6 fingered man?')
+	```js
+	// Display an info toast with no title
+	toastr.info('Are you the 6 fingered man?')
+	```
 
 ### Other Options
-	// Display a warning toast, with no title
-	toastr.warning('My name is Inigo Montoya. You killed my father, prepare to die!')
-	
-	// Display a success toast, with a title
-	toastr.success('Have fun storming the castle!', 'Miracle Max Says')
-	
-	// Display an error toast, with a title
-	toastr.error('I do not think that word means what you think it means.', 'Inconceivable!')
-	
-	// Immediately remove current toasts without using animation
-	toastr.remove()
-	
-	// Remove current toasts using animation
-	toastr.clear()
+```js
+// Display a warning toast, with no title
+toastr.warning('My name is Inigo Montoya. You killed my father, prepare to die!')
+
+// Display a success toast, with a title
+toastr.success('Have fun storming the castle!', 'Miracle Max Says')
+
+// Display an error toast, with a title
+toastr.error('I do not think that word means what you think it means.', 'Inconceivable!')
+
+// Immediately remove current toasts without using animation
+toastr.remove()
 
-	// Override global options
-	toastr.success('We do have the Kapua suite available.', 'Turtle Bay Resort', {timeOut: 5000})
+// Remove current toasts using animation
+toastr.clear()
+
+// Override global options
+toastr.success('We do have the Kapua suite available.', 'Turtle Bay Resort', {timeOut: 5000})
+```
+
+### Escape HTML characters
+In case you want to escape HTML charaters in title and message
+
+	toastr.options.escapeHtml = true;
 
 ### Close Button
 Optionally enable a close button
-
-    toastr.options.closeButton = true;
+```js
+toastr.options.closeButton = true;
+````
 
 Optionally override the close button's HTML. 
 
-    toastr.options.closeHtml = '<button><i class="icon-off"></i></button>';
+```js
+toastr.options.closeHtml = '<button><i class="icon-off"></i></button>';
+```
 
 You can also override the CSS/LESS for `#toast-container .toast-close-button`
 
+Optionally override the hide animation when the close button is clicked (falls back to hide configuration).
+```js
+toastr.options.closeMethod = 'fadeOut';
+toastr.options.closeDuration = 300;
+toastr.options.closeEasing = 'swing';
+```
+
 ### Display Sequence
 Show newest toast at bottom (top is default)
-
-	toastr.options.newestOnTop = false;
+```js
+toastr.options.newestOnTop = false;
+```
 
 ### Callbacks
-	// Define a callback for when the toast is shown/hidden
-	toastr.options.onShown = function() { console.log('hello'); }
-	toastr.options.onHidden = function() { console.log('goodbye'); }
+```js
+// Define a callback for when the toast is shown/hidden
+toastr.options.onShown = function() { console.log('hello'); }
+toastr.options.onHidden = function() { console.log('goodbye'); }
+```
 
 ### Animation Options
 Toastr will supply default animations, so you do not have to provide any of these settings. However you have the option to override the animations if you like.
 
 ####Easings
 Optionally override the animation easing to show or hide the toasts. Default is swing. swing and linear are built into jQuery.
-
-	toastr.options.showEasing = 'swing';
-	toastr.options.hideEasing = 'linear';
+```js
+toastr.options.showEasing = 'swing';
+toastr.options.hideEasing = 'linear';
+toastr.options.closeEasing = 'linear';
+```
 
 Using the jQuery Easing plugin (http://www.gsgd.co.uk/sandbox/jquery/easing/)
-
-	toastr.options.showEasing = 'easeOutBounce';
-	toastr.options.hideEasing = 'easeInBack';
+```js
+toastr.options.showEasing = 'easeOutBounce';
+toastr.options.hideEasing = 'easeInBack';
+toastr.options.closeEasing = 'easeInBack';
+```
 
 ####Animation Method
 Use the jQuery show/hide method of your choice. These default to fadeIn/fadeOut. The methods fadeIn/fadeOut, slideDown/slideUp, and show/hide are built into jQuery.
-
-	toastr.options.showMethod = 'slideDown'; 
-	toastr.options.hideMethod = 'slideUp'; 
+```js
+toastr.options.showMethod = 'slideDown';
+toastr.options.hideMethod = 'slideUp';
+toastr.options.closeMethod = 'slideUp';
+```
 	
 ###Prevent Duplicates
 Rather than having identical toasts stack, set the preventDuplicates property to true. Duplicates are matched to the previous toast based on their message content.
-
-    toastr.options.preventDuplicates = true;
-	
+```js
+toastr.options.preventDuplicates = true;
+```
 
 ###Timeouts
 Control how toastr interacts with users by setting timeouts appropriately. Timeouts can be disabled by setting them to 0.
-
-	toastr.options.timeOut = 30; // How long the toast will display without user interaction
-	toastr.options.extendedTimeOut = 60; // How long the toast will display after a user hovers over it
+```js
+toastr.options.timeOut = 30; // How long the toast will display without user interaction
+toastr.options.extendedTimeOut = 60; // How long the toast will display after a user hovers over it
+```
 	
 
 ###Progress Bar
 Visually indicate how long before a toast expires.
-
-    toastr.options.progressBar = true; 
+```js
+toastr.options.progressBar = true;
+```
 
 ## Building Toastr
 
@@ -179,4 +218,3 @@ Copyright © 2012-2015
 
 ## License
 toastr is under MIT license - http://www.opensource.org/licenses/mit-license.php
-

toastr.css renamed to build/toastr.css

@@ -85,8 +85,8 @@ button.toast-close-button {
 #toast-container {
   position: fixed;
   z-index: 999999;
+  pointer-events: none;
   /*overrides*/
-
 }
 #toast-container * {
   -moz-box-sizing: border-box;
@@ -95,6 +95,7 @@ button.toast-close-button {
 }
 #toast-container > div {
   position: relative;
+  pointer-events: auto;
   overflow: hidden;
   margin: 0 0 6px;
   padding: 15px 15px 15px 50px;
@@ -136,12 +137,14 @@ button.toast-close-button {
 #toast-container.toast-top-center > div,
 #toast-container.toast-bottom-center > div {
   width: 300px;
-  margin: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 #toast-container.toast-top-full-width > div,
 #toast-container.toast-bottom-full-width > div {
   width: 96%;
-  margin: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 .toast {
   background-color: #030303;