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

Fixup patches against upstream

Browse Source
This commit is contained in:
Friedrich W. H. Kossebau 2013-10-02 00:22:05 +02:00
parent ad8c163436
commit 5022c6391c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js 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 --- a/js/3rdparty/webodf/editor/MemberListView.js
+++ b/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; node.src = memberDetails.imageurl;
// update border color // update border color
node.style.borderColor = memberDetails.color; node.style.borderColor = memberDetails.color;
@ -12,7 +12,7 @@ index cbab8ec..a6381aa 100644
} else if (node.localName === "div") { } else if (node.localName === "div") {
node.setAttribute('fullname', memberDetails.fullname); 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, var doc = memberListDiv.ownerDocument,
htmlns = doc.documentElement.namespaceURI, htmlns = doc.documentElement.namespaceURI,
avatarDiv = doc.createElementNS(htmlns, "div"), avatarDiv = doc.createElementNS(htmlns, "div"),
@ -21,3 +21,12 @@ index cbab8ec..a6381aa 100644
fullnameNode = doc.createElement("div"); fullnameNode = doc.createElement("div");
avatarDiv.className = "memberListButton"; 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);

2
src/patches/hideCaretAvatar.patch
View File

@ -10,4 +10,4 @@ index 644f4b5..50881a2 100644
+ caretAvatarsInitiallyVisible: false, + caretAvatarsInitiallyVisible: false,
caretBlinksOnRangeSelect: true caretBlinksOnRangeSelect: true
}; };