Skip to content

Commit

Permalink
Merge branch 'szweibel:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
szweibel authored Jan 5, 2024
2 parents ff25a16 + f631a2b commit 5b0ceae
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:
# Create a gh-pages artifact in order to deploy to gh-pages.
- name: Upload GitHub Pages artifact
uses: actions/upload-pages-artifact@v1.0.7
uses: actions/upload-pages-artifact@v2
with:
# Path of the directory containing the static assets for our gh pages deployment.
path: ${{ env.DEPLOY_DIR }} # optional, default is _site/
Expand Down Expand Up @@ -234,4 +234,4 @@ jobs:
# Deployment to github pages
- name: Deploy GitHub Pages site
id: deployment
uses: actions/deploy-pages@v2.0.0
uses: actions/deploy-pages@v3
19 changes: 11 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -163,20 +163,23 @@
},
getSharedArrayBufferMissingMessage: function ()
{
const isCustom = window.location.hostname !== "webvm.io";
const isSecureContext = window.isSecureContext;
const text = [
"",
"",
color + "CheerpX could not start" + normal,
"",
"CheerpX depends on JavaScript's SharedArrayBuffer, that your browser",
" does not support.",
"CheerpX uses SharedArrayBuffer, which is not available right now.",
"",
"SharedArrayBuffer is currently enabled by default on recent",
" versions of Chrome, Edge, Firefox and Safari.",
"",
"",
"Give it a try from another browser!",
]
!isSecureContext && " - This page is not in a secure context. Serve over HTTPS or WSS.",
!isSecureContext && " " + underline + "https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts" + noral,
isCustom && " - The document is not cross-origin isolated.",
isCustom && " " + underline + "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements" + normal,
" - Your browser might not support SharedArrayBuffer.",
" Since 2022, all major browsers support this feature.",
" " + underline + "https://caniuse.com/sharedarraybuffer" + normal,
].filter(Boolean);

return text;
},
Expand Down

0 comments on commit 5b0ceae

Please sign in to comment.