From 9acd07058169b7b6a2ef700f7b671a06b77a0340 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han <jacky_cute0808@hotmail.com>
Date: Fri, 25 Sep 2015 13:43:19 +0800
Subject: [PATCH] Fixed socket set wrong cursor data on receive, prevent
 buildCursor execute on view mode

---
 public/js/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/js/index.js b/public/js/index.js
index ae3edb2..199be88 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1126,7 +1126,7 @@ socket.on('cursor focus', function (data) {
         console.debug(data);
     for (var i = 0; i < onlineUsers.length; i++) {
         if (onlineUsers[i].id == data.id) {
-            onlineUsers[i].cursor = data;
+            onlineUsers[i].cursor = data.cursor;
         }
     }
     if (data.id != socket.id)
@@ -1142,7 +1142,7 @@ socket.on('cursor activity', function (data) {
         console.debug(data);
     for (var i = 0; i < onlineUsers.length; i++) {
         if (onlineUsers[i].id == data.id) {
-            onlineUsers[i].cursor = data;
+            onlineUsers[i].cursor = data.cursor;
         }
     }
     if (data.id != socket.id)
@@ -1384,6 +1384,7 @@ function checkCursorTag(coord, ele) {
 }
 
 function buildCursor(user) {
+    if (currentMode == modeType.view) return;
     if (!user.cursor) return;
     var coord = editor.charCoords(user.cursor, 'windows');
     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(".name").text(user.name);
 
+        cursor[0].style.left = coord.left + 'px';
+        cursor[0].style.top = coord.top + 'px';
+        /*
         if (cursor.css('display') === 'none') {
             cursor[0].style.left = coord.left + 'px';
             cursor[0].style.top = coord.top + 'px';
@@ -1509,6 +1513,7 @@ function buildCursor(user) {
                 queue: false
             });
         }
+        */
 
         if (user.idle && cursor.css('display') !== 'none')
             cursor.stop(true).fadeOut();