Permalink
Browse files

Merge branch 'master' of github.com:CodeSeven/toastr

  • Loading branch information...
2 parents 15a5126 + 9d7df36 commit 64e72a1b1db97e9debd971a52e0a58d528fd4faf @drewfreyling drewfreyling committed Nov 29, 2013
Showing with 38 additions and 10 deletions.
  1. +11 −0 .travis.yml
  2. +11 −0 CHANGELOG.md
  3. +3 −0 package.json
  4. +5 −5 toastr.css
  5. +6 −2 toastr.js
  6. +1 −1 toastr.min.css
  7. +1 −2 toastr.min.js
View
@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+ - "0.10"
+
+install:
+ - npm install -g grunt-cli bower
+ - npm install
+ - bower install
+
+script:
+ - npm test
View
@@ -0,0 +1,11 @@
+# 2.0.1 (2013-11-1)
+
+#DRAFT
+
+## Features
+
+- **foo feature:**
+ - add support for foo then link to commit
+
+## Bug Fixes
+
View
@@ -31,5 +31,8 @@
"grunt-contrib-uglify": "~0.2.2",
"grunt-contrib-less": "~0.6.4",
"grunt-contrib-qunit": "~0.2.2"
+ },
+ "scripts": {
+ "test": "grunt"
}
}
View
@@ -1,4 +1,4 @@
-/*
+/*
* Toastr
* Version 2.0.1
* Copyright 2012 John Papa and Hans Fjällemark.
@@ -155,7 +155,7 @@ button.toast-close-button {
background-color: #f89406;
}
/*Responsive Design*/
-@media all and (max-width: 240px) {
+@media all and (max-width: 239px) {
#toast-container > div {
padding: 8px 8px 8px 50px;
width: 11em;
@@ -165,7 +165,7 @@ button.toast-close-button {
top: -0.2em;
}
}
-@media all and (min-width: 241px) and (max-width: 480px) {
+@media all and (min-width: 240px) and (max-width: 479px) {
#toast-container > div {
padding: 8px 8px 8px 50px;
width: 18em;
@@ -175,9 +175,9 @@ button.toast-close-button {
top: -0.2em;
}
}
-@media all and (min-width: 481px) and (max-width: 768px) {
+@media all and (min-width: 480px) and (max-width: 767px) {
#toast-container > div {
padding: 15px 15px 15px 50px;
width: 25em;
}
-}
+}
View
@@ -213,7 +213,11 @@
}
if (options.closeButton && $closeElement) {
$closeElement.click(function (event) {
- event.stopPropagation();
+ if( event.stopPropagation ) {
+ event.stopPropagation();
+ } else if( event.cancelBubble !== undefined && event.cancelBubble !== true ) {
+ event.cancelBubble = true;
+ }
hideToast(true);
});
}
@@ -299,7 +303,7 @@
});
}(typeof define === 'function' && define.amd ? define : function (deps, factory) {
if (typeof module !== 'undefined' && module.exports) { //Node
- module.exports = factory(require(deps[0]));
+ module.exports = factory(require('jquery'));
} else {
window['toastr'] = factory(window['jQuery']);
}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 64e72a1

Please sign in to comment.