Skip to content

Commit ff9ba77

Browse files
author
Reza Rahman
committed
Adding growl notification.
1 parent e8f8554 commit ff9ba77

File tree

8 files changed

+42
-11
lines changed

8 files changed

+42
-11
lines changed

‎javaee-javascript-main/src/main/webapp/chat.jsp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<link rel="stylesheet" href="css/chat/application.css">
99
<script src="https://code.jquery.com/jquery-1.10.2.min.js">script>
1010
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular.min.js">script>
11+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular-sanitize.min.js">script>
12+
<link rel="stylesheet" href="css/lib/angular-growl.min.css">
13+
<script src="javascript/lib/angular-growl.min.js">script>
1114
<script type="text/javascript">
1215
var principal = '${pageContext.request.userPrincipal.name}';
1316
script>
@@ -17,6 +20,7 @@
1720
<script src="javascript/chat/application.js">script>
1821
head>
1922
<body ng-controller="ChatController">
23+
<div style="float: right" growl>div>
2024
<div id="chat-panel">
2125
<label class="chat-label">Welcome to the Chat, {{user}}label>
2226
<div class="chat-box" auto-scroll="messages.length">

‎javaee-javascript-main/src/main/webapp/css/lib/angular-growl.min.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/**
2+
* angular-growl - v0.4.0 - 2013-11-19
3+
* https://github.com/marcorinck/angular-growl
4+
* Copyright (c) 2013 Marco Rinck; Licensed MIT
5+
*/
6+
7+
.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}

‎javaee-javascript-main/src/main/webapp/javascript/chat/application.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
'use strict';
22

33
var chatApplication = angular.module('chatApplication', ['chatControllers',
4-
'chatServices', 'chatDirectives']);
4+
'chatServices', 'chatDirectives', 'angular-growl']);
5+
6+
chatApplication.config(['growlProvider', function(growlProvider) {
7+
growlProvider.globalTimeToLive(2000);
8+
}]);

‎javaee-javascript-main/src/main/webapp/javascript/chat/controllers.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22

33
var chatControllers = angular.module('chatControllers', []);
44

5-
chatControllers.controller('ChatController', ['$scope', '$window', 'Chat',
6-
function($scope, $window, Chat) {
5+
chatControllers.controller('ChatController', ['$scope', 'growl', 'Chat',
6+
function($scope, growl, Chat) {
77
$scope.user = principal;
88
$scope.messages = [];
99
$scope.newMessage = '';
1010

1111
Chat.setListener(
1212
function(message) {
1313
$scope.messages.push(message);
14+
$scope.newMessage = '';
1415
$scope.$apply();
1516
},
1617
function(error) {
17-
$window.alert(error);
18+
growl.addErrorMessage(error);
19+
$scope.$apply();
1820
});
1921

2022
$scope.send = function() {
2123
Chat.send(principal, $scope.newMessage);
22-
$scope.newMessage = '';
2324
};
2425
}]);

‎javaee-javascript-main/src/main/webapp/javascript/lib/angular-growl.min.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎javaee-javascript-main/src/main/webapp/javascript/todo/application.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
'use strict';
22

33
var todoApplication = angular.module('todoApplication',
4-
['todoControllers', 'todoServices', 'todoDirectives']);
4+
['todoControllers', 'todoServices', 'todoDirectives', 'angular-growl']);
5+
6+
todoApplication.config(['growlProvider', function(growlProvider) {
7+
growlProvider.globalTimeToLive(2000);
8+
}]);

‎javaee-javascript-main/src/main/webapp/javascript/todo/controllers.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
var todoControllers = angular.module('todoControllers', []);
44

5-
todoControllers.controller('ToDoController', ['$scope', '$window', 'ToDo',
6-
function($scope, $window, ToDo) {
5+
todoControllers.controller('ToDoController', ['$scope', 'growl', 'ToDo',
6+
function($scope, growl, ToDo) {
77
$scope.user = principal;
88
$scope.newToDoDescription = '';
99
$scope.itemToEdit = null;
@@ -20,7 +20,7 @@ todoControllers.controller('ToDoController', ['$scope', '$window', 'ToDo',
2020
},
2121
function(error) {
2222
// Error.
23-
$window.alert(error.data.pop().message);
23+
growl.addErrorMessage(error.data.pop().message);
2424
});
2525
};
2626

@@ -37,7 +37,7 @@ todoControllers.controller('ToDoController', ['$scope', '$window', 'ToDo',
3737
},
3838
function(error) {
3939
// Error.
40-
$window.alert(error.data.pop().message);
40+
growl.addErrorMessage(error.data.pop().message);
4141
});
4242
};
4343

‎javaee-javascript-main/src/main/webapp/todo.jsp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,20 @@
77
<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
88
<link rel="stylesheet" href="css/todo/application.css">
99
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular.min.js">script>
10+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular-sanitize.min.js">script>
1011
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular-resource.min.js">script>
12+
<link rel="stylesheet" href="css/lib/angular-growl.min.css">
13+
<script src="javascript/lib/angular-growl.min.js">script>
1114
<script type="text/javascript">
12-
var principal = '${pageContext.request.userPrincipal.name}'; script>
15+
var principal = '${pageContext.request.userPrincipal.name}';
16+
script>
1317
<script src="javascript/todo/controllers.js">script>
1418
<script src="javascript/todo/services.js">script>
1519
<script src="javascript/todo/directives.js">script>
1620
<script src="javascript/todo/application.js">script>
1721
head>
1822
<body ng-controller="ToDoController">
23+
<div style="float: right" growl>div>
1924
<div class="center">
2025
<div id="todo-panel">
2126
<label class="todo-label" for="add-todo">{{user}}'s To Do Listlabel>

0 commit comments

Comments
 (0)