Commit 72b060d

authored

Merge branch 'develop' into translating-donate-link-from-react

2 parents 0015d21 + f98e7d6 commit 72b060dCopy full SHA for 72b060d

File tree

15 files changed

+5627

-1327

lines changed

client/modules
- About/pages
  - About.jsx
- IDE/components/Preferences
  - Preferences.unit.test.jsx
  - index.jsx
package-lock.json
package.json
server
- controllers
  - user.controller.js
- migrations
  - emailConsolidation.js
- types
  - email.ts
  - index.ts
- utils
- views

15 files changed

+5627

-1327

lines changed

`‎client/modules/About/pages/About.jsx‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ const About = () => {`
`52`	`52`
`53`	`53`	`const p5version = useSelector((state) => {`
`54`	`54`	`const index = state.files.find((file) => file.name === 'index.html');`
`55`		`- return index?.content.match(/\/p5\.js\/([\d.]+)\//)?.[1];`
	`55`	`+ return index?.content.match(/\/p5@([\d.]+)\//)?.[1];`
`56`	`56`	`});`
`57`	`57`
`58`	`58`	`return (`

`‎client/modules/IDE/components/Preferences/Preferences.unit.test.jsx‎`

Lines changed: 20 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -442,43 +442,44 @@ describe('<Preferences />', () => {`
`442`	`442`	`);`
`443`	`443`	`});`
`444`	`444`	`});`
`445`		`- describe('start wordwrap at false', () => {`
`446`		`- it('wordwrap toggle, starting at false', () => {`
`447`		`- // render the component with wordwrap prop set to false`
`448`		`- subject({ wordwrap: false });`
`449`		`-`
`450`		`- // get ahold of the radio buttons for toggling wordwrap`
`451`		`- const wordwrapRadioFalse = screen.getByRole('radio', {`
	`445`	`+ // TODO: Consolidate "linewrap" (reference from backend/User model) and "word wrap" (currently used in UI) into consistent naming.`
	`446`	`+ describe('start linewrap at false', () => {`
	`447`	`+ it('linewrap toggle, starting at false', () => {`
	`448`	`+ // render the component with linewrap prop set to false`
	`449`	`+ subject({ linewrap: false });`
	`450`	`+`
	`451`	`+ // get ahold of the radio buttons for toggling linewrap`
	`452`	`+ const linewrapRadioFalse = screen.getByRole('radio', {`
`452`	`453`	`name: /wordwrapoff/i`
`453`	`454`	`});`
`454`		`- const wordwrapRadioTrue = screen.getByRole('radio', {`
	`455`	`+ const linewrapRadioTrue = screen.getByRole('radio', {`
`455`	`456`	`name: /wordwrapon/i`
`456`	`457`	`});`
`457`	`458`
`458`	`459`	`testToggle(`
`459`		`- wordwrapRadioFalse,`
`460`		`- wordwrapRadioTrue,`
	`460`	`+ linewrapRadioFalse,`
	`461`	`+ linewrapRadioTrue,`
`461`	`462`	`props.setLinewrap,`
`462`	`463`	`true`
`463`	`464`	`);`
`464`	`465`	`});`
`465`	`466`	`});`
`466`		`- describe('start wordwrap at true', () => {`
`467`		`- it('wordwrap toggle, starting at true', () => {`
`468`		`- // render the component with wordwrap prop set to true`
`469`		`- subject({ wordwrap: true });`
	`467`	`+ describe('start linewrap at true', () => {`
	`468`	`+ it('linewrap toggle, starting at true', () => {`
	`469`	`+ // render the component with linewrap prop set to true`
	`470`	`+ subject({ linewrap: true });`
`470`	`471`
`471`		`- // get ahold of the radio buttons for toggling wordwrap`
`472`		`- const wordwrapRadioFalse = screen.getByRole('radio', {`
	`472`	`+ // get ahold of the radio buttons for toggling linewrap`
	`473`	`+ const linewrapRadioFalse = screen.getByRole('radio', {`
`473`	`474`	`name: /wordwrapoff/i`
`474`	`475`	`});`
`475`		`- const wordwrapRadioTrue = screen.getByRole('radio', {`
	`476`	`+ const linewrapRadioTrue = screen.getByRole('radio', {`
`476`	`477`	`name: /wordwrapon/i`
`477`	`478`	`});`
`478`	`479`
`479`	`480`	`testToggle(`
`480`		`- wordwrapRadioTrue,`
`481`		`- wordwrapRadioFalse,`
	`481`	`+ linewrapRadioTrue,`
	`482`	`+ linewrapRadioFalse,`
`482`	`483`	`props.setLinewrap,`
`483`	`484`	`false`
`484`	`485`	`);`

`‎client/modules/IDE/components/Preferences/index.jsx‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export default function Preferences() {`
`43`	`43`	`tabIndex,`
`44`	`44`	`fontSize,`
`45`	`45`	`autosave,`
`46`		`- wordwrap,`
	`46`	`+ linewrap,`
`47`	`47`	`lineNumbers,`
`48`	`48`	`lintWarning,`
`49`	`49`	`textOutput,`
`@@ -398,7 +398,7 @@ export default function Preferences() {`
`398`	`398`	`id="wordwrap-on"`
`399`	`399`	`className="preference__radio-button"`
`400`	`400`	`value="On"`
`401`		`- checked={wordwrap}`
	`401`	`+ checked={linewrap}`
`402`	`402`	`/>`
`403`	`403`	`<label htmlFor="wordwrap-on" className="preference__option">`
`404`	`404`	`{t('Preferences.On')}`
`@@ -411,7 +411,7 @@ export default function Preferences() {`
`411`	`411`	`id="wordwrap-off"`
`412`	`412`	`className="preference__radio-button"`
`413`	`413`	`value="Off"`
`414`		`- checked={!wordwrap}`
	`414`	`+ checked={!linewrap}`
`415`	`415`	`/>`
`416`	`416`	`<label htmlFor="wordwrap-off" className="preference__option">`
`417`	`417`	`{t('Preferences.Off')}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 72b060d

File tree

15 files changed

15 files changed

`‎client/modules/About/pages/About.jsx‎`

`‎client/modules/IDE/components/Preferences/Preferences.unit.test.jsx‎`

`‎client/modules/IDE/components/Preferences/index.jsx‎`

0 commit comments