Skip to content

Commit e9d14b3

Browse files
committed
Workaround firefox warning and inject if document is html
TypeError: can't access property "name", s.dataset is undefined WE2-1143 Signed-off-by: Raul Metsma <[email protected]>
1 parent 48c2145 commit e9d14b3

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
npm run test clean build package
3636
3737
- name: Upload artifacts
38-
uses: actions/upload-artifact@v4
38+
uses: actions/upload-artifact@v5
3939
with:
4040
name: web-eid-webextension-${{github.run_number}}
4141
path: dist/

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
uses: actions/checkout@v5
2323

2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v3
25+
uses: github/codeql-action/init@v4
2626
with:
2727
languages: javascript
2828
queries: +security-and-quality
2929

3030
- name: Autobuild
31-
uses: github/codeql-action/autobuild@v3
31+
uses: github/codeql-action/autobuild@v4
3232

3333
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@v3
34+
uses: github/codeql-action/analyze@v4

src/content/TokenSigning/injectPageScript.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,20 @@ export default function injectPageScript(): void {
3434
* The page script can be found here:
3535
* https://github.com/open-eid/chrome-token-signing/blob/master/extension/page.js
3636
*/
37+
if (document.contentType !== "text/html" && document.contentType !== "application/xhtml+xml") {
38+
return;
39+
}
3740
if (!document.querySelector("script[data-name='TokenSigning']")) {
3841
const s = document.createElement("script");
3942

4043
s.type = "text/javascript";
41-
s.dataset.name = "TokenSigning";
42-
s.dataset.by = "Web-eID extension";
44+
if (s.dataset) {
45+
s.dataset.name = "TokenSigning";
46+
s.dataset.by = "Web-eID extension";
47+
} else {
48+
s.setAttribute("data-name", "TokenSigning");
49+
s.setAttribute("data-by", "Web-eID extension");
50+
}
4351

4452
if (browser.runtime.getManifest()["manifest_version"] >= 3) {
4553
s.src = browser.runtime.getURL("token-signing-page-script.js");

0 commit comments

Comments
 (0)