Upstream avatar patch

pull/1/head
Victor Dubiniuk 11 years ago
parent 886273dd10
commit b0479cf8c9

@ -0,0 +1,24 @@
diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js
index cbab8ec..a6381aa 100644
--- a/js/3rdparty/webodf/editor/MemberListView.js
+++ b/js/3rdparty/webodf/editor/MemberListView.js
@@ -73,6 +73,10 @@ define("webodf/editor/MemberListView",
node.src = memberDetails.imageurl;
// update border color
node.style.borderColor = memberDetails.color;
+ } else if (node.localName === "span"){
+ node.style.display='block';
+ $(node).avatar(memberDetails.imageurl, 64);
+ node.style.borderColor = memberDetails.color;
} else if (node.localName === "div") {
node.setAttribute('fullname', memberDetails.fullname);
}
@@ -92,7 +96,7 @@ define("webodf/editor/MemberListView",
var doc = memberListDiv.ownerDocument,
htmlns = doc.documentElement.namespaceURI,
avatarDiv = doc.createElementNS(htmlns, "div"),
- imageElement = doc.createElement("img"),
+ imageElement = doc.createElement("span"),
fullnameNode = doc.createElement("div");
avatarDiv.className = "memberListButton";

@ -35,3 +35,4 @@ cp "$WEBODF_BUILDDIR"/programs/editor/editor.css ./css/3rdparty/webodf
# patches against upstream
patch -p1 -i src/patches/fontsCssPath.patch
patch -p1 -i src/patches/hideCaretAvatar.patch
patch -p1 -i src/patches/MemberListView-OCavatar.patch

Loading…
Cancel
Save