Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added option to hide close button on messages #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,30 @@ app.controller("demoCtrl", ['$scope', 'growl', function($scope, growl) {
}]);
````

###Disable close button on messages

* Default: false

Turn this on to hide the close button on messages, default behaviour is to display the close button.

````javascript
var app = angular.module('myApp', ['angular-growl']);

app.config(['growlProvider', function(growlProvider) {
growlProvider.globalDisableCloseButton(true);
}]);
````

You can override the global option and hide the close button in single messages too:

````javascript
app.controller("demoCtrl", ['$scope', 'growl', function($scope, growl) {
$scope.addSpecialWarnMessage = function() {
growl.addWarnMessage("<strong>This is a message without a close button</strong>", {disableCloseButton: true});
}
}]);
````

###Animations

Beginning with angularJS 1.2 growl messages can be automatically animated with CSS animations when adding and/or closing
Expand Down
14 changes: 9 additions & 5 deletions build/angular-growl.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* angular-growl - v0.4.0 - 2013-11-19
* angular-growl - v0.4.0 - 2014-03-12
* https://github.com/marcorinck/angular-growl
* Copyright (c) 2013 Marco Rinck; Licensed MIT
* Copyright (c) 2014 Marco Rinck; Licensed MIT
*/
angular.module('angular-growl', []);
angular.module('angular-growl').directive('growl', [
Expand All @@ -10,7 +10,7 @@ angular.module('angular-growl').directive('growl', [
'use strict';
return {
restrict: 'A',
template: '<div class="growl">' + '\t<div class="growl-item alert" ng-repeat="message in messages" ng-class="computeClasses(message)">' + '\t\t<button type="button" class="close" ng-click="deleteMessage(message)">&times;</button>' + ' <div ng-switch="message.enableHtml">' + ' <div ng-switch-when="true" ng-bind-html="message.text"></div>' + ' <div ng-switch-default ng-bind="message.text"></div>' + ' </div>' + '\t</div>' + '</div>',
template: '<div class="growl">' + '\t<div class="growl-item alert" ng-repeat="message in messages" ng-class="computeClasses(message)">' + '\t\t<button type="button" class="close" ng-click="deleteMessage(message)" ng-show="!message.disableCloseButton">&times;</button>' + ' <div ng-switch="message.enableHtml">' + ' <div ng-switch-when="true" ng-bind-html="message.text"></div>' + ' <div ng-switch-default ng-bind="message.text"></div>' + ' </div>' + '\t</div>' + '</div>',
replace: false,
scope: true,
controller: [
Expand Down Expand Up @@ -65,13 +65,16 @@ angular.module('angular-growl').directive('growl', [
]);
angular.module('angular-growl').provider('growl', function () {
'use strict';
var _ttl = null, _enableHtml = false, _messagesKey = 'messages', _messageTextKey = 'text', _messageSeverityKey = 'severity', _onlyUniqueMessages = true;
var _ttl = null, _enableHtml = false, _messagesKey = 'messages', _messageTextKey = 'text', _messageSeverityKey = 'severity', _onlyUniqueMessages = true, _disableCloseButton = false;
this.globalTimeToLive = function (ttl) {
_ttl = ttl;
};
this.globalEnableHtml = function (enableHtml) {
_enableHtml = enableHtml;
};
this.globalDisableCloseButton = function (disableCloseButton) {
_disableCloseButton = disableCloseButton;
};
this.messagesKey = function (messagesKey) {
_messagesKey = messagesKey;
};
Expand Down Expand Up @@ -127,7 +130,8 @@ angular.module('angular-growl').provider('growl', function () {
text: text,
severity: severity,
ttl: _config.ttl || _ttl,
enableHtml: _config.enableHtml || _enableHtml
enableHtml: _config.enableHtml || _enableHtml,
disableCloseButton: _config.disableCloseButton || _disableCloseButton
};
broadcastMessage(message);
}
Expand Down
4 changes: 2 additions & 2 deletions build/angular-growl.min.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* angular-growl - v0.4.0 - 2013-11-19
* angular-growl - v0.4.0 - 2014-03-12
* https://github.com/marcorinck/angular-growl
* Copyright (c) 2013 Marco Rinck; Licensed MIT
* Copyright (c) 2014 Marco Rinck; Licensed MIT
*/

.growl{position:fixed;top:10px;right:10px;float:right;width:250px}.growl-item.ng-enter,.growl-item.ng-leave{-webkit-transition:.5s linear all;-moz-transition:.5s linear all;-o-transition:.5s linear all;transition:.5s linear all}.growl-item.ng-enter,.growl-item.ng-leave.ng-leave-active{opacity:0}.growl-item.ng-leave,.growl-item.ng-enter.ng-enter-active{opacity:1}
6 changes: 3 additions & 3 deletions build/angular-growl.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/growlDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ angular.module("angular-growl").directive("growl", ["$rootScope", function ($roo
restrict: 'A',
template: '<div class="growl">' +
' <div class="growl-item alert" ng-repeat="message in messages" ng-class="computeClasses(message)">' +
' <button type="button" class="close" ng-click="deleteMessage(message)">&times;</button>' +
' <button type="button" class="close" ng-click="deleteMessage(message)" ng-show="!message.disableCloseButton">&times;</button>' +
' <div ng-switch="message.enableHtml">' +
' <div ng-switch-when="true" ng-bind-html="message.text"></div>' +
' <div ng-switch-default ng-bind="message.text"></div>' +
Expand Down
15 changes: 13 additions & 2 deletions src/growlFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ angular.module("angular-growl").provider("growl", function() {
_messagesKey = 'messages',
_messageTextKey = 'text',
_messageSeverityKey = 'severity',
_onlyUniqueMessages = true;
_onlyUniqueMessages = true,
_disableCloseButton = false;

/**
* set a global timeout (time to live) after which messages will be automatically closed
Expand All @@ -26,6 +27,15 @@ angular.module("angular-growl").provider("growl", function() {
_enableHtml = enableHtml;
};

/**
* set whether the close button should be displayed (default) or hidden
*
* @param {bool} disableCloseButton true to hide close button on all messages
*/
this.globalDisableCloseButton = function (disableCloseButton) {
_disableCloseButton = disableCloseButton;
};

/**
* sets the key in $http response the serverMessagesInterecptor is looking for server-sent messages, value of key
* needs to be an array of objects
Expand Down Expand Up @@ -108,7 +118,8 @@ angular.module("angular-growl").provider("growl", function() {
text: text,
severity: severity,
ttl: _config.ttl || _ttl,
enableHtml: _config.enableHtml || _enableHtml
enableHtml: _config.enableHtml || _enableHtml,
disableCloseButton: _config.disableCloseButton || _disableCloseButton
};

broadcastMessage(message);
Expand Down