Update build script and instructions
parent
4f5f51a085
commit
0cf521c406
@ -0,0 +1,3 @@
|
|||||||
|
tests/clover.xml
|
||||||
|
webodf/*
|
||||||
|
build/*
|
@ -1,91 +0,0 @@
|
|||||||
diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js
|
|
||||||
--- a/js/3rdparty/webodf/editor/MemberListView.js 2014-11-19 19:53:11.134235411 +0300
|
|
||||||
+++ b/js/3rdparty/webodf/editor/MemberListView.js 2014-11-19 19:56:27.562381909 +0300
|
|
||||||
@@ -69,6 +69,8 @@
|
|
||||||
|
|
||||||
while (node) {
|
|
||||||
if (node.memberId === memberId) {
|
|
||||||
+ node.setAttribute('uid', memberDetails.uid);
|
|
||||||
+ node.setAttribute('count', 1);
|
|
||||||
node = node.firstChild;
|
|
||||||
while (node) {
|
|
||||||
if (node.localName === "img") {
|
|
||||||
@@ -76,6 +78,11 @@
|
|
||||||
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){}
|
|
||||||
+ node.style.borderColor = memberDetails.color;
|
|
||||||
} else if (node.localName === "div") {
|
|
||||||
node.setAttribute('fullname', memberDetails.fullName);
|
|
||||||
}
|
|
||||||
@@ -95,7 +102,7 @@
|
|
||||||
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";
|
|
||||||
@@ -111,12 +118,15 @@
|
|
||||||
//avatar.getCaret().hideHandle();
|
|
||||||
};
|
|
||||||
avatarDiv.onclick = function () {
|
|
||||||
- var caret = editorSession.sessionView.getCaret(memberId);
|
|
||||||
- if (caret) {
|
|
||||||
- caret.toggleHandleVisibility();
|
|
||||||
+ if (memberId === editorSession.sessionController.getInputMemberId()){
|
|
||||||
+ documentsMain.onNickChange(memberId, fullnameNode);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
- memberListDiv.appendChild(avatarDiv);
|
|
||||||
+ if (memberId === editorSession.sessionController.getInputMemberId()){
|
|
||||||
+ memberListDiv.insertBefore(avatarDiv, memberListDiv.firstChild);
|
|
||||||
+ } else {
|
|
||||||
+ memberListDiv.appendChild(avatarDiv);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -127,7 +137,12 @@
|
|
||||||
var node = memberListDiv.firstChild;
|
|
||||||
while (node) {
|
|
||||||
if (node.memberId === memberId) {
|
|
||||||
- memberListDiv.removeChild(node);
|
|
||||||
+ var count = parseInt(node.getAttribute('count'));
|
|
||||||
+ if (count>1){
|
|
||||||
+ node.setAttribute('count', count-1);
|
|
||||||
+ } else {
|
|
||||||
+ memberListDiv.removeChild(node);
|
|
||||||
+ }
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
node = node.nextSibling;
|
|
||||||
@@ -140,8 +155,21 @@
|
|
||||||
*/
|
|
||||||
function addMember(memberId) {
|
|
||||||
var member = editorSession.getMember(memberId),
|
|
||||||
- properties = member.getProperties();
|
|
||||||
- createAvatarButton(memberId);
|
|
||||||
+ properties = member.getProperties(),
|
|
||||||
+ node = memberListDiv.firstChild,
|
|
||||||
+ found = false;
|
|
||||||
+ while (node) {
|
|
||||||
+ if (node.getAttribute('uid') === properties.uid) {
|
|
||||||
+ var count = parseInt(node.getAttribute('count'));
|
|
||||||
+ node.setAttribute('count', count+1);
|
|
||||||
+ found = true;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ node = node.nextSibling;
|
|
||||||
+ }
|
|
||||||
+ if (!found){
|
|
||||||
+ createAvatarButton(memberId);
|
|
||||||
+ }
|
|
||||||
updateAvatarButton(memberId, properties);
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,104 @@
|
|||||||
|
From c3f8c8d13d4fd0c9c4c1c47a5c53c184ad8e1c25 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
|
||||||
|
Date: Wed, 10 Jun 2015 19:26:42 +0300
|
||||||
|
Subject: [PATCH] Patch MemberListView manually
|
||||||
|
|
||||||
|
---
|
||||||
|
js/3rdparty/webodf/editor/MemberListView.js | 44 +++++++++++++++++++++++------
|
||||||
|
1 file changed, 36 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/js/3rdparty/webodf/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js
|
||||||
|
index c188e2a..c5ae12b 100644
|
||||||
|
--- a/js/3rdparty/webodf/editor/MemberListView.js
|
||||||
|
+++ b/js/3rdparty/webodf/editor/MemberListView.js
|
||||||
|
@@ -55,6 +55,8 @@ define("webodf/editor/MemberListView",
|
||||||
|
|
||||||
|
while (node) {
|
||||||
|
if (node.memberId === memberId) {
|
||||||
|
+ node.setAttribute('uid', memberDetails.uid);
|
||||||
|
+ node.setAttribute('count', 1);
|
||||||
|
node = node.firstChild;
|
||||||
|
while (node) {
|
||||||
|
if (node.localName === "img") {
|
||||||
|
@@ -62,6 +64,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){}
|
||||||
|
+ node.style.borderColor = memberDetails.color;
|
||||||
|
} else if (node.localName === "div") {
|
||||||
|
node.setAttribute('fullname', memberDetails.fullName);
|
||||||
|
}
|
||||||
|
@@ -81,7 +88,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 = "webodfeditor-memberListButton";
|
||||||
|
@@ -91,12 +98,15 @@ define("webodf/editor/MemberListView",
|
||||||
|
avatarDiv.memberId = memberId; // TODO: namespace?
|
||||||
|
|
||||||
|
avatarDiv.onclick = function () {
|
||||||
|
- var caret = editorSession.sessionView.getCaret(memberId);
|
||||||
|
- if (caret) {
|
||||||
|
- caret.toggleHandleVisibility();
|
||||||
|
+ if (memberId === editorSession.sessionController.getInputMemberId()){
|
||||||
|
+ documentsMain.onNickChange(memberId, fullnameNode);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
- memberListDiv.appendChild(avatarDiv);
|
||||||
|
+ if (memberId === editorSession.sessionController.getInputMemberId()){
|
||||||
|
+ memberListDiv.insertBefore(avatarDiv, memberListDiv.firstChild);
|
||||||
|
+ } else {
|
||||||
|
+ memberListDiv.appendChild(avatarDiv);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -107,7 +117,12 @@ define("webodf/editor/MemberListView",
|
||||||
|
var node = memberListDiv.firstChild;
|
||||||
|
while (node) {
|
||||||
|
if (node.memberId === memberId) {
|
||||||
|
- memberListDiv.removeChild(node);
|
||||||
|
+ var count = parseInt(node.getAttribute('count'));
|
||||||
|
+ if (count>1){
|
||||||
|
+ node.setAttribute('count', count-1);
|
||||||
|
+ } else {
|
||||||
|
+ memberListDiv.removeChild(node);
|
||||||
|
+ }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
node = node.nextSibling;
|
||||||
|
@@ -120,8 +135,21 @@ define("webodf/editor/MemberListView",
|
||||||
|
*/
|
||||||
|
function addMember(memberId) {
|
||||||
|
var member = editorSession.getMember(memberId),
|
||||||
|
- properties = member.getProperties();
|
||||||
|
- createAvatarButton(memberId);
|
||||||
|
+ properties = member.getProperties(),
|
||||||
|
+ node = memberListDiv.firstChild,
|
||||||
|
+ found = false;
|
||||||
|
+ while (node) {
|
||||||
|
+ if (node.getAttribute('uid') === properties.uid) {
|
||||||
|
+ var count = parseInt(node.getAttribute('count'));
|
||||||
|
+ node.setAttribute('count', count+1);
|
||||||
|
+ found = true;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ node = node.nextSibling;
|
||||||
|
+ }
|
||||||
|
+ if (!found){
|
||||||
|
+ createAvatarButton(memberId);
|
||||||
|
+ }
|
||||||
|
updateAvatarButton(memberId, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
@ -0,0 +1,67 @@
|
|||||||
|
From 1f9288176b2c31ec9a740284275ff9c1f6dbd8f4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
|
||||||
|
Date: Wed, 10 Jun 2015 19:35:23 +0300
|
||||||
|
Subject: [PATCH] Patch Tools manually
|
||||||
|
|
||||||
|
---
|
||||||
|
js/3rdparty/webodf/editor/Tools.js | 14 ++++++++++----
|
||||||
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/js/3rdparty/webodf/editor/Tools.js b/js/3rdparty/webodf/editor/Tools.js
|
||||||
|
index e5e2e9b..5ddf105 100644
|
||||||
|
--- a/js/3rdparty/webodf/editor/Tools.js
|
||||||
|
+++ b/js/3rdparty/webodf/editor/Tools.js
|
||||||
|
@@ -39,10 +39,11 @@ define("webodf/editor/Tools", [
|
||||||
|
"webodf/editor/widgets/editHyperlinks",
|
||||||
|
"webodf/editor/widgets/imageInserter",
|
||||||
|
"webodf/editor/widgets/paragraphStylesDialog",
|
||||||
|
- "webodf/editor/widgets/zoomSlider",
|
||||||
|
+ "owncloud/widgets/zoomCombo",
|
||||||
|
+ "owncloud/widgets/ocToolbar",
|
||||||
|
"webodf/editor/widgets/aboutDialog",
|
||||||
|
"webodf/editor/EditorSession"],
|
||||||
|
- function (ready, MenuItem, DropDownMenu, Button, DropDownButton, Toolbar, ParagraphAlignment, SimpleStyles, UndoRedoMenu, CurrentStyle, AnnotationControl, EditHyperlinks, ImageInserter, ParagraphStylesDialog, ZoomSlider, AboutDialog, EditorSession) {
|
||||||
|
+ function (ready, MenuItem, DropDownMenu, Button, DropDownButton, Toolbar, ParagraphAlignment, SimpleStyles, UndoRedoMenu, CurrentStyle, AnnotationControl, EditHyperlinks, ImageInserter, ParagraphStylesDialog, ZoomCombo, OcToolbar, AboutDialog, EditorSession) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
return function Tools(toolbarElementId, args) {
|
||||||
|
@@ -60,6 +61,7 @@ define("webodf/editor/Tools", [
|
||||||
|
paragraphStylesMenuItem, paragraphStylesDialog,
|
||||||
|
editorSession,
|
||||||
|
aboutDialog,
|
||||||
|
+ ocToolbar,
|
||||||
|
sessionSubscribers = [];
|
||||||
|
|
||||||
|
function placeAndStartUpWidget(widget) {
|
||||||
|
@@ -145,6 +147,10 @@ define("webodf/editor/Tools", [
|
||||||
|
|
||||||
|
// init
|
||||||
|
ready(function () {
|
||||||
|
+ ocToolbar = new OcToolbar(function (widget) {
|
||||||
|
+ widget.startup();
|
||||||
|
+ });
|
||||||
|
+
|
||||||
|
toolbar = new Toolbar({}, toolbarElementId);
|
||||||
|
|
||||||
|
// About
|
||||||
|
@@ -268,7 +274,7 @@ define("webodf/editor/Tools", [
|
||||||
|
createTool(CurrentStyle, args.paragraphStyleSelectingEnabled);
|
||||||
|
|
||||||
|
// Zoom Level Selector
|
||||||
|
- createTool(ZoomSlider, args.zoomingEnabled);
|
||||||
|
+ createTool(ZoomCombo, args.zoomingEnabled);
|
||||||
|
|
||||||
|
// hyper links
|
||||||
|
createTool(EditHyperlinks, args.hyperlinkEditingEnabled);
|
||||||
|
@@ -309,7 +315,7 @@ define("webodf/editor/Tools", [
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+ toolbar.startup();
|
||||||
|
setEditorSession(editorSession);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/js/3rdparty/webodf/editor/Editor.js b/js/3rdparty/webodf/editor/Editor.js
|
|
||||||
index 644f4b5..50881a2 100644
|
|
||||||
--- a/js/3rdparty/webodf/editor/Editor.js
|
|
||||||
+++ b/js/3rdparty/webodf/editor/Editor.js
|
|
||||||
@@ -383,7 +383,7 @@ define("webodf/editor/Editor", [
|
|
||||||
odfCanvas.addListener("statereadychange", function () {
|
|
||||||
var viewOptions = {
|
|
||||||
editInfoMarkersInitiallyVisible: collabEditing,
|
|
||||||
- caretAvatarsInitiallyVisible: collabEditing,
|
|
||||||
+ caretAvatarsInitiallyVisible: false,
|
|
||||||
caretBlinksOnRangeSelect: true
|
|
||||||
};
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
|||||||
diff --git a/js/3rdparty/webodf/editor/Tools.js b/js/3rdparty/webodf/editor/Tools.js
|
|
||||||
index c0aa4da..602edff 100644
|
|
||||||
--- a/js/3rdparty/webodf/editor/Tools.js
|
|
||||||
+++ b/js/3rdparty/webodf/editor/Tools.js
|
|
||||||
@@ -52,9 +52,10 @@ define("webodf/editor/Tools", [
|
|
||||||
"webodf/editor/widgets/editHyperlinks",
|
|
||||||
"webodf/editor/widgets/imageInserter",
|
|
||||||
"webodf/editor/widgets/paragraphStylesDialog",
|
|
||||||
- "webodf/editor/widgets/zoomSlider",
|
|
||||||
+ "owncloud/widgets/zoomCombo",
|
|
||||||
+ "owncloud/widgets/ocToolbar",
|
|
||||||
"webodf/editor/EditorSession"],
|
|
||||||
- function (ready, MenuItem, DropDownMenu, Button, DropDownButton, Toolbar, ParagraphAlignment, SimpleStyles, UndoRedoMenu, CurrentStyle, AnnotationControl, EditHyperlinks, ImageInserter, ParagraphStylesDialog, ZoomSlider, EditorSession) {
|
|
||||||
+ function (ready, MenuItem, DropDownMenu, Button, DropDownButton, Toolbar, ParagraphAlignment, SimpleStyles, UndoRedoMenu, CurrentStyle, AnnotationControl, EditHyperlinks, ImageInserter, ParagraphStylesDialog, ZoomCombo, OcToolbar, EditorSession) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
return function Tools(args) {
|
|
||||||
@@ -67,7 +68,8 @@ define("webodf/editor/Tools", [
|
|
||||||
loadButton, saveButton, closeButton,
|
|
||||||
formatDropDownMenu, formatMenuButton,
|
|
||||||
paragraphStylesMenuItem, paragraphStylesDialog, simpleStyles, currentStyle,
|
|
||||||
- zoomSlider,
|
|
||||||
+ zoomCombo,
|
|
||||||
+ ocToolbar,
|
|
||||||
undoRedoMenu,
|
|
||||||
editorSession,
|
|
||||||
paragraphAlignment,
|
|
||||||
@@ -121,6 +123,10 @@ define("webodf/editor/Tools", [
|
|
||||||
|
|
||||||
// init
|
|
||||||
ready(function () {
|
|
||||||
+ ocToolbar = new OcToolbar(function (widget) {
|
|
||||||
+ widget.startup();
|
|
||||||
+ });
|
|
||||||
+
|
|
||||||
toolbar = new Toolbar({}, "toolbar");
|
|
||||||
|
|
||||||
// Undo/Redo
|
|
||||||
@@ -171,12 +177,12 @@ define("webodf/editor/Tools", [
|
|
||||||
currentStyle.onToolDone = onToolDone;
|
|
||||||
|
|
||||||
// Zoom Level Selector
|
|
||||||
- zoomSlider = new ZoomSlider(function (widget) {
|
|
||||||
+ zoomCombo = new ZoomCombo(function (widget) {
|
|
||||||
widget.placeAt(toolbar);
|
|
||||||
widget.startup();
|
|
||||||
});
|
|
||||||
- sessionSubscribers.push(zoomSlider);
|
|
||||||
- zoomSlider.onToolDone = onToolDone;
|
|
||||||
+ sessionSubscribers.push(zoomCombo);
|
|
||||||
+ zoomCombo.onToolDone = onToolDone;
|
|
||||||
|
|
||||||
// Load
|
|
||||||
if (loadOdtFile) {
|
|
||||||
@@ -271,7 +277,7 @@ define("webodf/editor/Tools", [
|
|
||||||
});
|
|
||||||
closeButton.placeAt(toolbar);
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+ toolbar.startup();
|
|
||||||
setEditorSession(editorSession);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
--
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue