Commit 667a2a61 by Arturo Montejo Ráez

Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

parents e3e03f60 df9936af
...@@ -369,7 +369,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr ...@@ -369,7 +369,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
// //
// websockets events handling (Dashboard) // websockets events handling (Dashboard)
// //
/*
io.socket.on('update_peers', function (data) { io.socket.on('update_peers', function (data) {
if($scope.ws && $scope.sessionRunning && $scope.actual_try.actions && $scope.flags.paused == false && data.pcb_count<1) { if($scope.ws && $scope.sessionRunning && $scope.actual_try.actions && $scope.flags.paused == false && data.pcb_count<1) {
$scope.pause_ws(); $scope.pause_ws();
$scope.pauseTimer(); $scope.pauseTimer();
...@@ -379,8 +381,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr ...@@ -379,8 +381,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
dismissButton: true dismissButton: true
}); });
} }
});
});
*/
// Remove all listeners to this event // Remove all listeners to this event
io.socket.off('action'); io.socket.off('action');
......
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 sign in to comment