* [maintainer-tools PATCH] drm-intel: embed wavedrom engine and skin into the web page
@ 2015-12-08 9:25 Jani Nikula
2015-12-16 9:08 ` Jani Nikula
0 siblings, 1 reply; 2+ messages in thread
From: Jani Nikula @ 2015-12-08 9:25 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Thomas Wood
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@intel.com>
---
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@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [maintainer-tools PATCH] drm-intel: embed wavedrom engine and skin into the web page
2015-12-08 9:25 [maintainer-tools PATCH] drm-intel: embed wavedrom engine and skin into the web page Jani Nikula
@ 2015-12-16 9:08 ` Jani Nikula
0 siblings, 0 replies; 2+ messages in thread
From: Jani Nikula @ 2015-12-16 9:08 UTC (permalink / raw)
To: intel-gfx; +Cc: Thomas Wood
On Tue, 08 Dec 2015, Jani Nikula <jani.nikula@intel.com> wrote:
> 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@intel.com>
Pushed.
> ---
> 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
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-16 9:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-08 9:25 [maintainer-tools PATCH] drm-intel: embed wavedrom engine and skin into the web page Jani Nikula
2015-12-16 9:08 ` Jani Nikula
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.