version update

Author: Arjan Kempes

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-flashmessage",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/akempes/angular-flashmessage",
   "authors": [
     "Arjan Kempes <a_kempes@msn.com>"

dist/flashmessage.js

@@ -52,9 +52,18 @@ module
         options = angular.extend(options, data);
     };
 
-    this.$get = ['$q', '$timeout', '$rootScope', function( $q, $timeout, $rootScope ) {
+    this.$get = ['$q', '$interval', '$rootScope', function( $q, $interval, $rootScope ) {
 
         var me = {},
+        getValue = function(data) {
+            var i;
+            for ( i = 0; i < data.length; i+=1) {
+                if(data[i] !== undefined){
+                    return data[i];
+                }
+            }
+            return undefined;
+        },
         updatePersistence = function function_name (amount) {
             angular.forEach(me.messages, function(msg){
                 msg.persist_counter += amount;
@@ -85,12 +94,12 @@ module
                     type            : item.type,
                     data            : data,
                     defer           : $q.defer(),
-                    persist         : persist || types[index].persist || options.persist || 0,
-                    persist_counter : persist || types[index].persist || options.persist || 0,
-                    delay           : delay || types[index].delay || options.delay || 0,
-                    template        : template || types[index].template || options.template || 0,
-                    clickToClose    : clickToClose || types[index].clickToClose || options.clickToClose || 0,
-                    showClose       : showClose || types[index].showClose || options.showClose || 0,
+                    persist         : getValue([ persist, types[index].persist, options.persist, 0 ]),
+                    persist_counter : getValue([ persist, types[index].persist, options.persist, 0 ]),
+                    delay           : getValue([ delay, types[index].delay, options.delay, 0 ]),
+                    template        : getValue([ template, types[index].template, options.template, 0 ]),
+                    clickToClose    : getValue([ clickToClose, types[index].clickToClose, options.clickToClose, 0 ]),
+                    showClose       : getValue([ showClose, types[index].showClose, options.showClose, 0 ]),
                     close           : function (data) {
                         if(data==='clickToClose' && !msg.clickToClose){
                             return;
@@ -99,12 +108,14 @@ module
                         var indexMsg = me.messages.map(function(x){ return x.$$hashKey; }).indexOf(msg.$$hashKey);
                         me.messages.splice(indexMsg, 1);
 
+                        $interval.cancel(me.timeout);
+
                         msg.defer.resolve({result:data, msg:msg});
                     }
                 };
 
                 if(msg.delay && msg.delay > 0){
-                    msg.timeout = $timeout(function(){ msg.close('timedout'); }, msg.delay);
+                    msg.timeout = $interval(function(){ msg.close('timedout'); }, msg.delay);
                 }
 
                 me.messages.push(msg);

dist/flashmessage.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-flashmessage",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "dependencies": {},
   "repository": {
     "type": "git",