Merge branch 'pr/383' into HEAD

kint-php · Feb 22, 2022 · 8d7e518 · 8d7e518
2 parents 9f7a159 + aa386d3
commit 8d7e518
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
diff --git a/build/kint.phar b/build/kint.phar
diff --git a/resources/compiled/aante-light.css b/resources/compiled/aante-light.css
diff --git a/resources/compiled/original.css b/resources/compiled/original.css
diff --git a/resources/compiled/rich.js b/resources/compiled/rich.js
diff --git a/resources/compiled/solarized-dark.css b/resources/compiled/solarized-dark.css
diff --git a/resources/compiled/solarized.css b/resources/compiled/solarized.css
diff --git a/resources/js/rich.js b/resources/js/rich.js
@@ -159,11 +159,29 @@ if (typeof window.kintRich === 'undefined') {
                             ')' +
                             kintRich.mktag('/title') +
                             kintRich.mktag('meta charset="utf-8"') +
-                            document.getElementsByClassName('kint-rich-script')[0].outerHTML +
-                            document.getElementsByClassName('kint-rich-style')[0].outerHTML +
+                            /**
+                             * `tag.getAttribute('nonce')` doesn't work for security reasons.
+                             * See https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/nonce#accessing_nonces_and_nonce_hiding.
+                             */
+                            kintRich.mktag(
+                                'script class="kint-rich-script" nonce="' +
+                                    kintRich.script.nonce +
+                                    '"'
+                            ) +
+                            kintRich.script.innerHTML +
+                            kintRich.mktag('/script') +
+                            /**
+                             * `tag.getAttribute('nonce')` doesn't work for security reasons.
+                             * See https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/nonce#accessing_nonces_and_nonce_hiding.
+                             */
+                            kintRich.mktag(
+                                'style class="kint-rich-style" nonce="' + kintRich.style.nonce + '"'
+                            ) +
+                            kintRich.style.innerHTML +
+                            kintRich.mktag('/style') +
                             kintRich.mktag('/head') +
                             kintRich.mktag('body') +
-                            '<input style="width: 100%" placeholder="Take some notes!">' +
+                            '<input class="kint-note-input" placeholder="Take some notes!">' +
                             '<div class="kint-rich">' +
                             kintContainer.parentNode.outerHTML +
                             '</div>' +

diff --git a/resources/sass/_base.scss b/resources/sass/_base.scss
@@ -505,3 +505,7 @@ $caret-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5
     font-weight: bold;
   }
 }
+
+input.kint-note-input {
+  width: 100%;
+}