Fixup patches against upstream
This commit is contained in:
parent
ad8c163436
commit
5022c6391c
@ -1,8 +1,8 @@
|
||||
diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js
|
||||
index cbab8ec..a6381aa 100644
|
||||
index cbab8ec..f51aec3 100644
|
||||
--- a/js/3rdparty/webodf/editor/MemberListView.js
|
||||
+++ b/js/3rdparty/webodf/editor/MemberListView.js
|
||||
@@ -73,6 +73,10 @@ define("webodf/editor/MemberListView",
|
||||
@@ -73,6 +73,9 @@ define("webodf/editor/MemberListView",
|
||||
node.src = memberDetails.imageurl;
|
||||
// update border color
|
||||
node.style.borderColor = memberDetails.color;
|
||||
@ -12,7 +12,7 @@ index cbab8ec..a6381aa 100644
|
||||
} else if (node.localName === "div") {
|
||||
node.setAttribute('fullname', memberDetails.fullname);
|
||||
}
|
||||
@@ -92,7 +96,7 @@ define("webodf/editor/MemberListView",
|
||||
@@ -92,7 +95,7 @@ define("webodf/editor/MemberListView",
|
||||
var doc = memberListDiv.ownerDocument,
|
||||
htmlns = doc.documentElement.namespaceURI,
|
||||
avatarDiv = doc.createElementNS(htmlns, "div"),
|
||||
@ -21,3 +21,12 @@ index cbab8ec..a6381aa 100644
|
||||
fullnameNode = doc.createElement("div");
|
||||
|
||||
avatarDiv.className = "memberListButton";
|
||||
@@ -110,7 +113,7 @@ define("webodf/editor/MemberListView",
|
||||
avatarDiv.onclick = function () {
|
||||
var caret = editorSession.sessionView.getCaret(memberId);
|
||||
if (caret) {
|
||||
- caret.toggleHandleVisibility();
|
||||
+ //caret.toggleHandleVisibility();
|
||||
}
|
||||
};
|
||||
memberListDiv.appendChild(avatarDiv);
|
||||
|
Loading…
x
Reference in New Issue
Block a user