Merge pull request #23 from invertase/development

Merge in development branch
invertase · Aug 6, 2015 · b7553f6 · b7553f6
2 parents d3f4686 + ec8ec74
commit b7553f6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -136,6 +136,13 @@ toasty.error();
 toasty.warning();
 ```
 
+To create a "quick toast", just pass a string or integer to the function instead:
+
+```javascript
+toasty('Quick Toast!');
+toasty.success('Quick Success Toast!');
+```
+
 ##### Event Handlers & Broadcasting
 
 You can easily hook into individual toast item events by calling a functions:

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "angular-toasty",
     "description": "A slick, simple, standalone AngularJS module with extensive features that provides growl-style alerts and messages for your app.",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "main": [
         "dist/angular-toasty.js",
         "dist/angular-toasty.css"

diff --git a/dist/angular-toasty.js b/dist/angular-toasty.js
@@ -242,6 +242,13 @@ angular.module('angular-toasty').factory('toasty', ['$rootScope', 'toastyConfig'
 	 * @param  {string} type    Type of toasty; success, info, error etc.
 	 */
 	var toasty = function(options, type) {
+
+		if (angular.isString(options) && options != '' || angular.isNumber(options)) {
+			options = {
+				title: options.toString()
+			};
+		}
+
 		if (!options || !options.title && !options.msg) {
 			console.error('angular-toasty: No toast title or message specified!');
 		} else {

diff --git a/dist/angular-toasty.min.js b/dist/angular-toasty.min.js
diff --git a/example/script.js b/example/script.js
@@ -57,8 +57,6 @@ angular.module('toasty-example').controller('ExampleController', ['$scope', 'toa
 
 		$scope.button = $scope.button == 'ping' ? 'pong' : 'ping';
 
-		console.log(toasty.getGlobalConfig())
-
 		toasty[$scope.options.type]({
 			title: $scope.options.title,
 			msg: $scope.options.msg,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-toasty",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "Invertase",
   "devDependencies": {
     "bower": "~1.4.1",

diff --git a/src/js/service.js b/src/js/service.js
@@ -9,6 +9,13 @@ angular.module('angular-toasty').factory('toasty', ['$rootScope', 'toastyConfig'
 	 * @param  {string} type    Type of toasty; success, info, error etc.
 	 */
 	var toasty = function(options, type) {
+
+		if (angular.isString(options) && options != '' || angular.isNumber(options)) {
+			options = {
+				title: options.toString()
+			};
+		}
+
 		if (!options || !options.title && !options.msg) {
 			console.error('angular-toasty: No toast title or message specified!');
 		} else {