DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing the patching of the patch (fixup for 47dbf676e2f5f11474c71d8c99204f8496640115)

Browse Source
This commit is contained in:
Friedrich W. H. Kossebau 2013-12-06 15:34:57 +01:00
parent 5c9b6e92fa
commit 1cb64de6b0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/patches/MemberListView-OCavatar.patch
View File

@ -1,20 +1,20 @@
diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js diff --git b/js/3rdparty/webodf/editor/MemberListView.js a/js/3rdparty/webodf/editor/MemberListView.js
index cbab8ec..f51aec3 100644 index 83074ba..9f604c7 100644
--- a/js/3rdparty/webodf/editor/MemberListView.js --- b/js/3rdparty/webodf/editor/MemberListView.js
+++ b/js/3rdparty/webodf/editor/MemberListView.js +++ a/js/3rdparty/webodf/editor/MemberListView.js
@@ -73,6 +73,9 @@ define("webodf/editor/MemberListView", @@ -76,6 +76,11 @@ define("webodf/editor/MemberListView",
node.src = memberDetails.imageUrl; node.src = memberDetails.imageUrl;
// update border color // update border color
node.style.borderColor = memberDetails.color; node.style.borderColor = memberDetails.color;
+ } else if (node.localName === "span" && memberDetails.imageUrl){ + } else if (node.localName === "span" && memberDetails.imageUrl){
+ try { + try {
+ $(node).avatar(memberDetails.imageUrl, 60); + $(node).avatar(memberDetails.imageUrl, 60);
+ } catch (e){} + } catch (e){}
+ node.style.borderColor = memberDetails.color; + node.style.borderColor = memberDetails.color;
} else if (node.localName === "div") { } else if (node.localName === "div") {
node.setAttribute('fullname', memberDetails.fullname); node.setAttribute('fullname', memberDetails.fullName);
} }
@@ -94,7 +97,7 @@ define("webodf/editor/MemberListView", @@ -95,7 +100,7 @@ define("webodf/editor/MemberListView",
var doc = memberListDiv.ownerDocument, var doc = memberListDiv.ownerDocument,
htmlns = doc.documentElement.namespaceURI, htmlns = doc.documentElement.namespaceURI,
avatarDiv = doc.createElementNS(htmlns, "div"), avatarDiv = doc.createElementNS(htmlns, "div"),
@ -23,7 +23,7 @@ index cbab8ec..f51aec3 100644
fullnameNode = doc.createElement("div"); fullnameNode = doc.createElement("div");
avatarDiv.className = "memberListButton"; avatarDiv.className = "memberListButton";
@@ -112,7 +115,7 @@ define("webodf/editor/MemberListView", @@ -113,7 +118,7 @@ define("webodf/editor/MemberListView",
avatarDiv.onclick = function () { avatarDiv.onclick = function () {
var caret = editorSession.sessionView.getCaret(memberId); var caret = editorSession.sessionView.getCaret(memberId);
if (caret) { if (caret) {