From b3d03b819c4b69f19cb740584895b473c8398b50 Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Thu, 2 Jul 2015 17:54:45 +0200 Subject: [PATCH 1/4] Serve odf and pdf sandbox from the server to prepare CSP http header for Firefox compatibility as Firefox does not support CSP in meta tag (see https://bugzilla.mozilla.org/show_bug.cgi?id=663570). --- .../sandboxes}/odfcanvas_sandbox.html | 7 +- .../sandboxes}/pdfcanvas_sandbox.html | 7 +- src/app/spreed-webrtc-server/context.go | 1 + src/app/spreed-webrtc-server/main.go | 64 +++++++++++++++++-- static/js/directives/odfcanvas.js | 9 +-- static/js/directives/pdfcanvas.js | 11 +--- static/js/main.js | 18 ------ static/js/services/resturl.js | 3 + 8 files changed, 78 insertions(+), 42 deletions(-) rename {static/partials => html/sandboxes}/odfcanvas_sandbox.html (71%) rename {static/partials => html/sandboxes}/pdfcanvas_sandbox.html (56%) diff --git a/static/partials/odfcanvas_sandbox.html b/html/sandboxes/odfcanvas_sandbox.html similarity index 71% rename from static/partials/odfcanvas_sandbox.html rename to html/sandboxes/odfcanvas_sandbox.html index abe06482..40ee1e35 100644 --- a/static/partials/odfcanvas_sandbox.html +++ b/html/sandboxes/odfcanvas_sandbox.html @@ -1,8 +1,9 @@ - + WebODF Sandbox - + +