diff options
| author | Friedrich W. H. Kossebau <friedrich@kogmbh.com> | 2013-12-06 18:34:57 +0400 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <friedrich@kogmbh.com> | 2013-12-06 18:34:57 +0400 |
| commit | 1cb64de6b05611638b8704e24dfe7e2156e472a2 (patch) | |
| tree | 0cd9acc7cccd0e4038d1de33763de2a08686e0c8 /src | |
| parent | 5c9b6e92fa3e259ed370165ce2b8ed701a0ad797 (diff) | |
Fixing the patching of the patch (fixup for 47dbf676e2f5f11474c71d8c99204f8496640115)
Diffstat (limited to 'src')
| -rw-r--r-- | src/patches/MemberListView-OCavatar.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/patches/MemberListView-OCavatar.patch b/src/patches/MemberListView-OCavatar.patch index 24ce77eb..3320fc1f 100644 --- a/src/patches/MemberListView-OCavatar.patch +++ b/src/patches/MemberListView-OCavatar.patch @@ -1,20 +1,20 @@ -diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js -index cbab8ec..f51aec3 100644 ---- a/js/3rdparty/webodf/editor/MemberListView.js -+++ b/js/3rdparty/webodf/editor/MemberListView.js -@@ -73,6 +73,9 @@ define("webodf/editor/MemberListView", +diff --git b/js/3rdparty/webodf/editor/MemberListView.js a/js/3rdparty/webodf/editor/MemberListView.js +index 83074ba..9f604c7 100644 +--- b/js/3rdparty/webodf/editor/MemberListView.js ++++ a/js/3rdparty/webodf/editor/MemberListView.js +@@ -76,6 +76,11 @@ define("webodf/editor/MemberListView", node.src = memberDetails.imageUrl; // update border color node.style.borderColor = memberDetails.color; + } else if (node.localName === "span" && memberDetails.imageUrl){ -+ try { -+ $(node).avatar(memberDetails.imageUrl, 60); -+ } catch (e){} ++ try { ++ $(node).avatar(memberDetails.imageUrl, 60); ++ } catch (e){} + node.style.borderColor = memberDetails.color; } 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, htmlns = doc.documentElement.namespaceURI, avatarDiv = doc.createElementNS(htmlns, "div"), @@ -23,7 +23,7 @@ index cbab8ec..f51aec3 100644 fullnameNode = doc.createElement("div"); avatarDiv.className = "memberListButton"; -@@ -112,7 +115,7 @@ define("webodf/editor/MemberListView", +@@ -113,7 +118,7 @@ define("webodf/editor/MemberListView", avatarDiv.onclick = function () { var caret = editorSession.sessionView.getCaret(memberId); if (caret) { |