feat(notifications): begin implementing multiple notifications support

HabitRPG · Sep 29, 2014 · 6fb8bc3 · 6fb8bc3
1 parent fb550cb
commit 6fb8bc3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/scripts/controllers/tasksCtrl.js b/scripts/controllers/tasksCtrl.js
@@ -57,6 +57,11 @@ habitrpg
   .controller('TasksCtrl',
   ['$scope', '$rootScope', 'filterFilter', 'User', 'Notification', '$state', '$ionicActionSheet',
   function($scope, $rootScope, filterFilter, User, Notification, $state, $ionicActionSheet) {
+    Notification.push({type: 'text', text: 'Notification at ' + Date.now()});
+    Notification.push({type: 'text', text: 'Notification at ' + Date.now()});
+    Notification.push({type: 'text', text: 'Notification at ' + Date.now()});
+    Notification.push({type: 'text', text: 'Notification at ' + Date.now()});
+    Notification.push({type: 'text', text: 'Notification at ' + Date.now()});
 
     $scope.newTask = {};
 

diff --git a/scripts/services/notificationServices.js b/scripts/services/notificationServices.js
@@ -1,7 +1,7 @@
 angular.module('notificationServices', []).
     factory('Notification', ['$filter','$rootScope', '$timeout', function ($filter,$rootScope, $timeout) {
 
-        $rootScope.notification = {type:null,data:null};
+        $rootScope.notifications = [];
         var active = false;
         var timer = null;
         var goldFilter = $filter('gold');
@@ -27,8 +27,8 @@ angular.module('notificationServices', []).
             },
 
             push: function (message) {
-                var notif = $rootScope.notification.data = {};
-                $rootScope.notification.type = message.type;
+                var notif = {};
+                notif.type = message.type;
                 switch(message.type) {
                   case 'stats':
                     if (message.stats.gp) {
@@ -41,11 +41,15 @@ angular.module('notificationServices', []).
                       notif.hp = message.stats.hp.toFixed(2)
                     break;
                   case 'text':
-                    $rootScope.notification.data = message.text;
+                    notif.data = message.text;
                     break;
                 }
 
-                this.animate()
+                $rootScope.notifications.push(notif);
+
+                $timeout(function(){
+                    $rootScope.notifications.pop();
+                }, 2000);
             },
 
             get: function () {

diff --git a/views/notifications.jade b/views/notifications.jade
@@ -1,5 +1,6 @@
 // Notifications
-.bar.bar-header.bar-energized.notif-bar(ng-show='notification.type')
+.bar.bar-header.bar-energized.notif-bar(ng-repeat="notification in notifications",
+                                        style='margin-top: {{($index * 44) +"px"}}')
   h1.title
     span(ng-if='notification.type=="text"', ng-bind-html='notification.data')
     span(ng-if='notification.type=="stats"')