From 77a074232ea88db251cc301aa6c906ae85f042d0 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 15 Oct 2014 00:09:36 +0300 Subject: [PATCH 1/2] Translate relative path into absolute for fonts stripping index.php --- js/3rdparty/webodf/editor/EditorSession.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/3rdparty/webodf/editor/EditorSession.js b/js/3rdparty/webodf/editor/EditorSession.js index 5c33e5af..38298b2f 100644 --- a/js/3rdparty/webodf/editor/EditorSession.js +++ b/js/3rdparty/webodf/editor/EditorSession.js @@ -43,6 +43,8 @@ define("webodf/editor/EditorSession", [ ], 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.DomUtils"); runtime.loadClass("odf.OdfUtils"); runtime.loadClass("ops.OdtDocument"); From d5e356c4a1c8b91c9b1c97d3b90637af80dfded7 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 15 Oct 2014 01:09:06 +0300 Subject: [PATCH 2/2] Update a related patch --- src/patches/fontsCssPath.patch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/patches/fontsCssPath.patch b/src/patches/fontsCssPath.patch index 53ba62fd..1e8f0bb9 100644 --- a/src/patches/fontsCssPath.patch +++ b/src/patches/fontsCssPath.patch @@ -2,7 +2,7 @@ diff --git a/js/3rdparty/webodf/editor/EditorSession.js b/js/3rdparty/webodf/edi index dc90ac1..d890a8e 100644 --- a/js/3rdparty/webodf/editor/EditorSession.js +++ b/js/3rdparty/webodf/editor/EditorSession.js -@@ -36,7 +36,7 @@ +@@ -39,10 +39,12 @@ /*global define, runtime, core, gui, ops, document */ define("webodf/editor/EditorSession", [ @@ -11,3 +11,8 @@ index dc90ac1..d890a8e 100644 ], 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.DomUtils"); + runtime.loadClass("odf.OdfUtils"); + runtime.loadClass("ops.OdtDocument");