vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] Who is viewing - compatibility issue with socket.io v1.3.7 and v1.4.4. Fixes frappe/erpnext#1519

Browse source
This commit is contained in:
Anand Doshi 2016-01-18 13:03:24 +05:30
parent 3fbdd558af
commit d57a1b4b98
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/form/footer/timeline_item.html
View file

@ -57,7 +57,7 @@
{% } %} "
data-doctype="{%= data.doctype %}"
data-name="{%= data.name %}"></i>
<span class="likes-count text-muted">{{ data._liked_by.length }}</span>
<span class="likes-count text-muted">{{ (data._liked_by || []).length }}</span>
</span>
</div>
<div class="reply">

15
socketio.js
View file

@ -201,16 +201,16 @@ function can_subscribe_doc(args) {
.end(function(err, res) {
if (!res) {
console.log("No response for doc_subscribe");
} else if (res.status == 403) {
return;
} else if (err) {
console.log(err);
} else if (res.status == 200) {
args.callback(err, res);
} else {
console.log("Something went wrong", err, res);
}
@ -226,8 +226,13 @@ function send_viewers(args) {
// open doc room
var room = get_open_doc_room(args.socket, args.doctype, args.docname);
var socketio_room = io.sockets.adapter.rooms[room] || {};
// for compatibility with both v1.3.7 and 1.4.4
var clients_dict = ("sockets" in socketio_room) ? socketio_room.sockets : socketio_room;
// socket ids connected to this room
var clients = Object.keys(io.sockets.adapter.rooms[room] || {});
var clients = Object.keys(clients_dict || {});
var viewers = [];
for (var i in io.sockets.sockets) {