Commit e78f7b53 authored by Ujvari Gergely's avatar Ujvari Gergely

Counting changes instead of notifications for sidebar icon

parent 4e15df2d
...@@ -437,7 +437,7 @@ class App ...@@ -437,7 +437,7 @@ class App
unless uri is href unless uri is href
annotator.plugins.Store.loadAnnotationsFromSearch uri: uri annotator.plugins.Store.loadAnnotationsFromSearch uri: uri
$scope.has_update = false $scope.new_updates = 0
# Notifications # Notifications
$scope.notifications = [] $scope.notifications = []
...@@ -453,25 +453,29 @@ class App ...@@ -453,25 +453,29 @@ class App
$scope.addUpdateNotification = -> $scope.addUpdateNotification = ->
# Do not add an update notification twice # Do not add an update notification twice
unless $scope.has_update unless $scope.new_updates > 0
notification = notification =
type: 'update' type: 'update'
text: 'Reload to see new annotations' text: 'Click to load ' + $scope.new_updates + ' changes.'
callback: => callback: =>
$scope.reloadAnnotations() $scope.reloadAnnotations()
$scope.removeNotificationUpdate() $scope.removeNotificationUpdate()
close: $scope.removeNotificationUpdate close: $scope.removeNotificationUpdate
$scope.notifications.unshift notification $scope.notifications.unshift notification
$scope.has_update = true
$element.find('.tri').toggle('fg_highlight',{color:'lightblue'}) $element.find('.tri').toggle('fg_highlight',{color:'lightblue'})
$timeout -> $timeout ->
$element.find('.tri').toggle('fg_highlight',{color:'lightblue'}) $element.find('.tri').toggle('fg_highlight',{color:'lightblue'})
,500 ,500
$scope.$watch 'new_updates', (updates) ->
for notif in $scope.notifications
if notif.type is 'update'
notif.text = 'Click to load ' + updates + ' changes.'
$scope.initUpdater = -> $scope.initUpdater = ->
$scope.has_update = false $scope.new_updates = 0
path = window.location.protocol + '//' + window.location.hostname + ':' + path = window.location.protocol + '//' + window.location.hostname + ':' +
window.location.port + '/__streamer__' window.location.port + '/__streamer__'
...@@ -511,16 +515,19 @@ class App ...@@ -511,16 +515,19 @@ class App
if check.message.updated is annotation.updated then continue if check.message.updated is annotation.updated then continue
else else
$scope.addUpdateNotification() $scope.addUpdateNotification()
$scope.new_updates +=1
break break
if action is 'delete' if action is 'delete'
# We haven't deleted this yet # We haven't deleted this yet
$scope.addUpdateNotification() $scope.addUpdateNotification()
$scope.new_updates +=1
break break
else else
if action is 'delete' if action is 'delete'
continue # Probably our own delete or doesn't concern us continue # Probably our own delete or doesn't concern us
else else
$scope.addUpdateNotification() $scope.addUpdateNotification()
$scope.new_updates +=1
break break
$timeout => $timeout =>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment