Merge pull request #2124 from tdamsma/togglediv-jupyterlab-workaround

Inline toggleDiv

Merge pull request #2124 from tdamsma/togglediv-jupyterlab-workaround
Inline toggleDiv
7cec55ab · scoder · GitHub · bab4d4b8 · 5f087c81 · 7cec55ab
Commit 7cec55ab authored Mar 06, 2018 by scoder Committed by GitHub Mar 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 13 deletions

Cython/Compiler/Annotate.py Cython/Compiler/Annotate.py +7 -13

No files found.
--- a/Cython/Compiler/Annotate.py
+++ b/Cython/Compiler/Annotate.py
@@ -79,14 +79,6 @@ class AnnotationCCodeWriter(CCodeWriter):
            css.append(HtmlFormatter().get_style_defs('.cython'))
        return '\n'.join(css)

-    _js = """
-    function toggleDiv(id) {
-        theDiv = id.nextElementSibling
-        if (theDiv.style.display != 'block') theDiv.style.display = 'block';
-        else theDiv.style.display = 'none';
-    }
-    """.strip()
-
    _css_template = textwrap.dedent("""
        body.cython { font-family: courier; font-size: 12; }

@@ -141,9 +133,6 @@ class AnnotationCCodeWriter(CCodeWriter):
                <style type="text/css">
                {css}
                </style>
-                <script>
-                {js}
-                </script>
            </head>
            <body class="cython">
            <p><span style="border-bottom: solid 1px grey;">Generated by Cython {watermark}</span>{more_info}</p>
@@ -151,7 +140,7 @@ class AnnotationCCodeWriter(CCodeWriter):
                <span style="background-color: #FFFF00">Yellow lines</span> hint at Python interaction.<br />
                Click on a line that starts with a "<code>+</code>" to see the C code that Cython generated for it.
            </p>
-            ''').format(css=self._css(), js=self._js, watermark=Version.watermark,
+            ''').format(css=self._css(), watermark=Version.watermark,
                        filename=os.path.basename(source_filename) if source_filename else '',
                        more_info=coverage_info)
        ]
@@ -253,7 +242,12 @@ class AnnotationCCodeWriter(CCodeWriter):
                     calls['py_macro_api'] + calls['pyx_macro_api'])

            if c_code:
-                onclick = " onclick='toggleDiv(this)'"
+                onclick = textwrap.dedent('''
+                     onclick="
+                    this.nextElementSibling.style.display != 'block' ?
+                    this.nextElementSibling.style.display = 'block' :
+                    this.nextElementSibling.style.display = 'none'
+                "''').replace('\n', '')
                expandsymbol = '+'
            else:
                onclick = ''