ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2723 from FinnStutzenstein/Clock

Browse Source 
Fixing the clock
This commit is contained in:
Norman Jäckel 2016-12-02 14:46:43 +01:00 committed by GitHub
commit 926d04f610
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openslides/core/static/js/core/projector.js
View File

@ -203,11 +203,21 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
.controller('SlideClockCtrl', [ .controller('SlideClockCtrl', [
'$scope', '$scope',
function($scope) { '$interval',
function($scope, $interval) {
// Attention! Each object that is used here has to be dealt on server side. // Attention! Each object that is used here has to be dealt on server side.
// Add it to the coresponding get_requirements method of the ProjectorElement // Add it to the coresponding get_requirements method of the ProjectorElement
// class. // class.
$scope.servertime = ( Date.now() / 1000 - $scope.serverOffset ) * 1000; $scope.servertime = ( Date.now() / 1000 - $scope.serverOffset ) * 1000;
var interval = $interval(function () {
$scope.servertime = ( Date.now() / 1000 - $scope.serverOffset ) * 1000;
}, 30000); // Update the clock every 30 seconds
$scope.$on('$destroy', function() {
if (interval) {
$interval.cancel(interval);
}
});
} }
]) ])