The wavedrom timeline will be missing from html pages served over https due to "mixed active content" blocking [1], because the wavedrom engine and skin are only available over http. Embed the engine and skin into the resulting html to avoid the problem. The rst :url: will fetch and include the scripts at html build time. [1] https://developer.mozilla.org/en-US/docs/Security/MixedContent Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> --- drm-intel-timeline.rst | 21 +++++++++++++++++---- drm-intel.rst | 1 - 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drm-intel-timeline.rst b/drm-intel-timeline.rst index 0d78046736b2..e1766a5df98b 100644 --- a/drm-intel-timeline.rst +++ b/drm-intel-timeline.rst @@ -1,10 +1,23 @@ -.. This is a wrapper intended to both keep the master document clean of the raw -.. html script stuff and to keep the wavedrom source pure json. +.. raw:: html + + <script type="text/javascript"> + /* Embedded WaveDrom skin from http://wavedrom.com/skins/default.js */ + +.. raw:: html + :url: http://wavedrom.com/skins/default.js .. raw:: html - <script src="http://wavedrom.com/skins/default.js"; type="text/javascript"></script> - <script src="http://wavedrom.com/WaveDrom.js"; type="text/javascript"></script> + </script> + <script type="text/javascript"> + /* Embedded WaveDrom engine from http://wavedrom.com/WaveDrom.js */ + +.. raw:: html + :url: http://wavedrom.com/WaveDrom.js + +.. raw:: html + + </script> <script type="WaveDrom"> .. raw:: html diff --git a/drm-intel.rst b/drm-intel.rst index dc1393bbec21..c6b0800e2dbc 100644 --- a/drm-intel.rst +++ b/drm-intel.rst @@ -136,7 +136,6 @@ kernel release cycle. Worth noting is that we're working on two or three kernel releases at the same time. Big features take a long time to hit a kernel release. There are no fast paths. -.. Note: This requires JavaScript and will access http://wavedrom.com to render. .. include:: drm-intel-timeline.rst For predictions on the future merge windows and releases, see -- 2.1.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
