Skip to content

Commit 6d63a7c

Browse files
committed
Merge branch 'release-2.20.6' into develop
2 parents dff2ce0 + ddfb9d8 commit 6d63a7c

File tree

5 files changed

+13
-22
lines changed

5 files changed

+13
-22
lines changed

client/modules/IDE/components/Banner.jsx

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
// import { Trans } from 'react-i18next';
3+
import { Trans } from 'react-i18next';
44
import { CrossIcon } from '../../../common/icons';
55

66
/**
@@ -24,28 +24,18 @@ import { CrossIcon } from '../../../common/icons';
2424

2525
const Banner = ({ onClose }) => {
2626
// URL can be updated depending on the opportunity or announcement.
27-
// const bannerURL = 'https://processingfoundation.org/donate';
27+
const bannerURL = 'https://processingfoundation.org/donate';
2828

2929
// currently holds donation copy, will switch back when temp maintenance is done
30-
// const bannerCopy = (
31-
// <>
32-
// <Trans i18nKey="Banner.Copy" components={{ bold: <strong /> }} />
33-
// </>
34-
// );
35-
36-
// temp copy for maintenance, will remove on 3/22/2026
37-
const bannerTempCopy = (
30+
const bannerCopy = (
3831
<>
39-
p5js.org will be undergoing scheduled maintenance on{' '}
40-
<strong>Sunday March 22, 2026 8:00am CET</strong>. The p5.js website may
41-
be down for up to 24 hours.
32+
<Trans i18nKey="Banner.Copy" components={{ bold: <strong /> }} />
4233
</>
4334
);
4435

4536
return (
4637
<div className="banner">
47-
{/* <a href={bannerURL}>{bannerCopy}</a> */}
48-
<a href="https://p5js.org">{bannerTempCopy}</a>
38+
<a href={bannerURL}>{bannerCopy}</a>
4939
<button className="banner-close-button" onClick={onClose}>
5040
<CrossIcon icon={{ default: '#000', hover: '#333' }} />
5141
</button>

client/modules/IDE/pages/IDEView.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const IDEView = () => {
114114
const [sidebarSize, setSidebarSize] = useState(160);
115115
const [isOverlayVisible, setIsOverlayVisible] = useState(false);
116116
const [MaxSize, setMaxSize] = useState(window.innerWidth);
117-
const [displayBanner, setDisplayBanner] = useState(true); // set to true if in use
117+
const [displayBanner, setDisplayBanner] = useState(false); // set to true if in use
118118

119119
const cmRef = useRef({});
120120

@@ -189,12 +189,12 @@ const IDEView = () => {
189189
const lastClosedAt = stored ? Number(stored) : null;
190190

191191
if (!lastClosedAt) {
192-
setDisplayBanner(true); // set to true if in use
192+
setDisplayBanner(false); // set to true if in use
193193
return;
194194
}
195195

196196
if (minutesSince(lastClosedAt) >= BANNER_COOLDOWN_MINUTES) {
197-
setDisplayBanner(true); // set to true if in use
197+
setDisplayBanner(false); // set to true if in use
198198
} else {
199199
setDisplayBanner(false);
200200
}

common/p5Versions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ export const currentP5Version = '1.11.11'; // Don't update to 2.x until 2026
55
// JSON.stringify([...document.querySelectorAll('._132722c7')].map(n => n.innerText), null, 2)
66
// TODO: use their API for this to grab these at build time?
77
export const p5Versions = [
8-
{ version: '2.2.2', label: '(Beta)' },
8+
{ version: '2.2.3', label: '(Beta)' },
9+
'2.2.2',
910
'2.2.1',
1011
'2.2.0',
1112
'2.1.2',

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "p5.js-web-editor",
3-
"version": "2.20.5",
3+
"version": "2.20.6",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

0 commit comments

Comments
 (0)