diff --git a/README.md b/README.md index a294518..92899dc 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ Thanks Marco Rinck for the original code, the following people have contributed * [soumya92](https://github.com/soumya92) * [willjk](https://github.com/willjk) * [wardvijf](https://github.com/wardvijf) +* [blitzmann](https://github.com/blitzmann) # License Copyright (C) 2015 Marco Rinck diff --git a/src/growlDirective.js b/src/growlDirective.js index 56ee81a..d062b53 100644 --- a/src/growlDirective.js +++ b/src/growlDirective.js @@ -28,10 +28,11 @@ angular.module("angular-growl").directive("growl", [ //Cancels all promises within message upon deleting message or stop deleting. $scope.stopTimeoutClose = function (message) { - if (!message.clickToClose) { - angular.forEach(message.promises, function (promise) { - $interval.cancel(promise); - }); + angular.forEach(message.promises, function (promise) { + $interval.cancel(promise); + }); + + if (!message.disableUserClose){ if (message.close) { growlMessages.deleteMessage(message); } else { @@ -84,7 +85,7 @@ angular.module("angular-growl").run(['$templateCache', function ($templateCache) $templateCache.put("templates/growl/growl.html", '
' + '
' + - '' + + '' + '' + '

' + '
' + diff --git a/src/growlFactory.js b/src/growlFactory.js index 609c454..bf224dd 100644 --- a/src/growlFactory.js +++ b/src/growlFactory.js @@ -14,6 +14,7 @@ angular.module("angular-growl").provider("growl", function () { _inline = false, _position = 'top-right', _disableCloseButton = false, + _disableUserClose = false, _disableIcons = false, _reverseOrder = false, _disableCountDown = false, @@ -250,6 +251,7 @@ angular.module("angular-growl").provider("growl", function () { disableCloseButton: _config.disableCloseButton === undefined ? _disableCloseButton : _config.disableCloseButton, disableIcons: _config.disableIcons === undefined ? _disableIcons : _config.disableIcons, disableCountDown: _config.disableCountDown === undefined ? _disableCountDown : _config.disableCountDown, + disableUserClose: _config.disableUserClose === undefined ? _disableUserClose : _config.disableUserClose, position: _config.position || _position, referenceId: _config.referenceId || _referenceId, translateMessage: _config.translateMessage === undefined ? _translateMessages : _config.translateMessage,