Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
667a2a61
authored
Jul 26, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'develop' of
http://gitlab.ujaen.es/yotta/pictogram
into develop
parents
e3e03f60
df9936af
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
sails/src/assets/scripts/modules/student/controllers/session.js
sails/src/assets/scripts/modules/student/controllers/session.js
View file @
667a2a61
...
...
@@ -369,7 +369,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
//
// websockets events handling (Dashboard)
//
/*
io.socket.on('update_peers', function (data) {
if($scope.ws && $scope.sessionRunning && $scope.actual_try.actions && $scope.flags.paused == false && data.pcb_count<1) {
$scope.pause_ws();
$scope.pauseTimer();
...
...
@@ -379,8 +381,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
dismissButton: true
});
}
});
});
*/
// Remove all listeners to this event
io
.
socket
.
off
(
'action'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment