Merge pull request #378 from owncloud/fix-373
Translate relative path into absolute for fonts
This commit is contained in:
commit
c7e584f405
2
js/3rdparty/webodf/editor/EditorSession.js
vendored
2
js/3rdparty/webodf/editor/EditorSession.js
vendored
@ -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");
|
||||
|
@ -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");
|
||||
|
Loading…
x
Reference in New Issue
Block a user