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

Fixed cursor id not valid to selector

Browse source
This commit is contained in:
Cheng-Han, Wu 2016-01-22 19:48:07 -06:00
parent 90710bc78b
commit e473a4e61b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/js/index.js
View file

@ -1373,7 +1373,7 @@ socket.on('cursor focus', function (data) {
if (data.id != socket.id) if (data.id != socket.id)
buildCursor(data); buildCursor(data);
//force show //force show
var cursor = $('#' + data.id); var cursor = $('div[data-clientid="' + data.id + '"]');
if (cursor.length > 0) { if (cursor.length > 0) {
cursor.stop(true).fadeIn(); cursor.stop(true).fadeIn();
} }
@ -1400,7 +1400,7 @@ socket.on('cursor blur', function (data) {
if (data.id != socket.id) if (data.id != socket.id)
buildCursor(data); buildCursor(data);
//force hide //force hide
var cursor = $('#' + data.id); var cursor = $('div[data-clientid="' + data.id + '"]');
if (cursor.length > 0) { if (cursor.length > 0) {
cursor.stop(true).fadeOut(); cursor.stop(true).fadeOut();
} }
@ -1648,8 +1648,8 @@ function buildCursor(user) {
if ($('.other-cursors').length <= 0) { if ($('.other-cursors').length <= 0) {
$("<div class='other-cursors'>").insertAfter('.CodeMirror-cursors'); $("<div class='other-cursors'>").insertAfter('.CodeMirror-cursors');
} }
if ($('#' + user.id).length <= 0) { if ($('div[data-clientid="' + user.id + '"]').length <= 0) {
var cursor = $('<div id="' + user.id + '" class="other-cursor" style="display:none;"></div>'); var cursor = $('<div data-clientid="' + user.id + '" class="other-cursor" style="display:none;"></div>');
cursor.attr('data-line', user.cursor.line); cursor.attr('data-line', user.cursor.line);
cursor.attr('data-ch', user.cursor.ch); cursor.attr('data-ch', user.cursor.ch);
cursor.attr('data-offset-left', 0); cursor.attr('data-offset-left', 0);
@ -1726,7 +1726,7 @@ function buildCursor(user) {
checkCursorTag(coord, cursortag); checkCursorTag(coord, cursortag);
} else { } else {
var cursor = $('#' + user.id); var cursor = $('div[data-clientid="' + user.id + '"]');
var lineDiff = Math.abs(cursor.attr('data-line') - user.cursor.line); var lineDiff = Math.abs(cursor.attr('data-line') - user.cursor.line);
cursor.attr('data-line', user.cursor.line); cursor.attr('data-line', user.cursor.line);
cursor.attr('data-ch', user.cursor.ch); cursor.attr('data-ch', user.cursor.ch);