From 5bbbe99a771c22e176e52cd34f346c882aec0248 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 26 Jun 2016 17:36:04 +0200 Subject: [PATCH] remove unused patches --- src/patches/Patch-EditorSession.patch | 30 ------- src/patches/Patch-MemberListView.patch | 104 ------------------------- src/patches/Patch-Tools.patch | 67 ---------------- src/patches/dojoStylesPill.patch | 14 ---- 4 files changed, 215 deletions(-) delete mode 100644 src/patches/Patch-EditorSession.patch delete mode 100644 src/patches/Patch-MemberListView.patch delete mode 100644 src/patches/Patch-Tools.patch delete mode 100644 src/patches/dojoStylesPill.patch diff --git a/src/patches/Patch-EditorSession.patch b/src/patches/Patch-EditorSession.patch deleted file mode 100644 index 6a97b2af..00000000 --- a/src/patches/Patch-EditorSession.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 28f377dc8fd3411ce7fad011140626484e180ac8 Mon Sep 17 00:00:00 2001 -From: Victor Dubiniuk -Date: Wed, 10 Jun 2015 19:29:27 +0300 -Subject: [PATCH] Patch EditorSession manually - ---- - js/3rdparty/webodf/editor/EditorSession.js | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/js/3rdparty/webodf/editor/EditorSession.js b/js/3rdparty/webodf/editor/EditorSession.js -index f2e91b6..709fd24 100644 ---- a/js/3rdparty/webodf/editor/EditorSession.js -+++ b/js/3rdparty/webodf/editor/EditorSession.js -@@ -25,10 +25,12 @@ - /*global runtime, define, document, core, odf, gui, ops*/ - - define("webodf/editor/EditorSession", [ -- "dojo/text!resources/fonts/fonts.css" -+ "dojo/text!" + OC.filePath('documents', 'css', 'fonts.css') - ], function (fontsCSS) { // fontsCSS is retrieved as a string, using dojo's text retrieval AMD plugin - "use strict"; - -+ fontsCSS = fontsCSS.replace(/\.\/fonts/g, OC.appswebroots['documents']+'/css/fonts'); -+ - runtime.loadClass("core.Async"); - runtime.loadClass("core.DomUtils"); - runtime.loadClass("odf.OdfUtils"); --- -2.1.4 - diff --git a/src/patches/Patch-MemberListView.patch b/src/patches/Patch-MemberListView.patch deleted file mode 100644 index 67ead040..00000000 --- a/src/patches/Patch-MemberListView.patch +++ /dev/null @@ -1,104 +0,0 @@ -From c3f8c8d13d4fd0c9c4c1c47a5c53c184ad8e1c25 Mon Sep 17 00:00:00 2001 -From: Victor Dubiniuk -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 - diff --git a/src/patches/Patch-Tools.patch b/src/patches/Patch-Tools.patch deleted file mode 100644 index 264f2678..00000000 --- a/src/patches/Patch-Tools.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1f9288176b2c31ec9a740284275ff9c1f6dbd8f4 Mon Sep 17 00:00:00 2001 -From: Victor Dubiniuk -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 - diff --git a/src/patches/dojoStylesPill.patch b/src/patches/dojoStylesPill.patch deleted file mode 100644 index 812b948e..00000000 --- a/src/patches/dojoStylesPill.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/css/3rdparty/webodf/dojo-app.css b/css/3rdparty/webodf/dojo-app.css -index a30426b..ee1c0f3 100644 ---- a/css/3rdparty/webodf/dojo-app.css -+++ b/css/3rdparty/webodf/dojo-app.css -@@ -6,7 +6,7 @@ - * It is highly, highly recommended that you develop your CSS using Stylus: http://learnboost.github.com/stylus/. - */ - --@import '../../../js/3rdparty/resources/dojo/resources/dojo.css'; -+/* @import '../../../js/3rdparty/resources/dojo/resources/dojo.css'; */ - @import '../../../js/3rdparty/resources/dijit/themes/claro/claro.css'; - @import '../../../js/3rdparty/resources/dojox/layout/resources/ExpandoPane.css'; - @import '../../../js/3rdparty/resources/dojox/widget/ColorPicker/ColorPicker.css'; -