depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed socket set wrong cursor data on receive, prevent buildCursor execute on view mode

Browse source
This commit is contained in:
Wu Cheng-Han 2015-09-25 13:43:19 +08:00
parent f8b029b2f4
commit 9acd070581
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public/js/index.js
View file

@ -1126,7 +1126,7 @@ socket.on('cursor focus', function (data) {
console.debug(data); console.debug(data);
for (var i = 0; i < onlineUsers.length; i++) { for (var i = 0; i < onlineUsers.length; i++) {
if (onlineUsers[i].id == data.id) { if (onlineUsers[i].id == data.id) {
onlineUsers[i].cursor = data; onlineUsers[i].cursor = data.cursor;
} }
} }
if (data.id != socket.id) if (data.id != socket.id)
@ -1142,7 +1142,7 @@ socket.on('cursor activity', function (data) {
console.debug(data); console.debug(data);
for (var i = 0; i < onlineUsers.length; i++) { for (var i = 0; i < onlineUsers.length; i++) {
if (onlineUsers[i].id == data.id) { if (onlineUsers[i].id == data.id) {
onlineUsers[i].cursor = data; onlineUsers[i].cursor = data.cursor;
} }
} }
if (data.id != socket.id) if (data.id != socket.id)
@ -1384,6 +1384,7 @@ function checkCursorTag(coord, ele) {
} }
function buildCursor(user) { function buildCursor(user) {
if (currentMode == modeType.view) return;
if (!user.cursor) return; if (!user.cursor) return;
var coord = editor.charCoords(user.cursor, 'windows'); var coord = editor.charCoords(user.cursor, 'windows');
coord.left = coord.left < 4 ? 4 : coord.left; coord.left = coord.left < 4 ? 4 : coord.left;
@ -1497,6 +1498,9 @@ function buildCursor(user) {
cursortag.find('i').removeClass().addClass('fa').addClass(iconClass); cursortag.find('i').removeClass().addClass('fa').addClass(iconClass);
cursortag.find(".name").text(user.name); cursortag.find(".name").text(user.name);
cursor[0].style.left = coord.left + 'px';
cursor[0].style.top = coord.top + 'px';
/*
if (cursor.css('display') === 'none') { if (cursor.css('display') === 'none') {
cursor[0].style.left = coord.left + 'px'; cursor[0].style.left = coord.left + 'px';
cursor[0].style.top = coord.top + 'px'; cursor[0].style.top = coord.top + 'px';
@ -1509,6 +1513,7 @@ function buildCursor(user) {
queue: false queue: false
}); });
} }
*/
if (user.idle && cursor.css('display') !== 'none') if (user.idle && cursor.css('display') !== 'none')
cursor.stop(true).fadeOut(); cursor.stop(true).fadeOut();