From 068390bf834bfe4198c33297e7e3efdb2df5c635 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 26 Mar 2014 23:14:01 +0300 Subject: [PATCH] Cleaner way to get current memberId --- js/3rdparty/webodf/editor/EditorSession.js | 4 ---- js/3rdparty/webodf/editor/MemberListView.js | 14 ++++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/js/3rdparty/webodf/editor/EditorSession.js b/js/3rdparty/webodf/editor/EditorSession.js index 175155dd..5c33e5af 100644 --- a/js/3rdparty/webodf/editor/EditorSession.js +++ b/js/3rdparty/webodf/editor/EditorSession.js @@ -348,10 +348,6 @@ define("webodf/editor/EditorSession", [ session.enqueue(opQueue); } }; - - this.getLocalMemberId = function(){ - return localMemberId; - }; this.insertTable = function (initialRows, initialColumns, tableStyleName, tableColumnStyleName, tableCellStyleMatrix) { var op = new ops.OpInsertTable(); diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js index 2aff605d..c8f347b7 100644 --- a/js/3rdparty/webodf/editor/MemberListView.js +++ b/js/3rdparty/webodf/editor/MemberListView.js @@ -116,17 +116,19 @@ define("webodf/editor/MemberListView", //avatar.getCaret().hideHandle(); }; avatarDiv.onclick = function () { - documentsMain.onNickChange(memberId, fullnameNode); + if (memberId === editorSession.sessionController.getInputMemberId()){ + documentsMain.onNickChange(memberId, fullnameNode); + } var caret = editorSession.sessionView.getCaret(memberId); if (caret) { //caret.toggleHandleVisibility(); } }; - if (memberId === editorSession.getLocalMemberId()){ - memberListDiv.insertBefore(avatarDiv, memberListDiv.firstChild); - } else { - memberListDiv.appendChild(avatarDiv); - } + if (memberId === editorSession.sessionController.getInputMemberId()){ + memberListDiv.insertBefore(avatarDiv, memberListDiv.firstChild); + } else { + memberListDiv.appendChild(avatarDiv); + } } /**