Skip to content

Commit 0f7787e

Browse files
authored
Merge pull request #566 from engaging-computing/dev
Version 3.1.2
2 parents 1a28153 + 83372f9 commit 0f7787e

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ The Engaging Computing Group develops new technologies to enable learners—yout
99
## Status
1010
[![CircleCI](https://circleci.com/gh/engaging-computing/MYR.svg?style=shield)](https://circleci.com/gh/engaging-computing/MYR)
1111

12-
## Change Log - 3.1.0 -> 3.1.1
13-
- Patched font-size bug, previously changing font-size would clear code in the editor
14-
- Dependency updates
15-
- nvmrc file updated (10.13 -> 12.18)
12+
## Change Log - 3.1.1 -> 3.1.2
13+
- Fixed a bug where an old scene without a name can crash the client view
1614

1715

1816
## Acknowledgments

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "myr",
3-
"version": "3.1.1",
3+
"version": "3.1.2",
44
"private": false,
55
"engines": {
66
"node": "^12.18.2"

src/components/structural/header/ProjectView.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,15 @@ class Project extends React.Component {
373373
* @returns 1 if project a should come before project b, -1 if b should come before a
374374
*/
375375
projectSort = (a,b)=>{
376-
if(a.name.toUpperCase() < b.name.toUpperCase())
377-
{
378-
return -1;
379-
}
380-
else if(a.name.toUpperCase() > b.name.toUpperCase())
381-
{
382-
return 1;
376+
if(a.name && b.name) {
377+
if(a.name.toUpperCase() < b.name.toUpperCase())
378+
{
379+
return -1;
380+
}
381+
else if(a.name.toUpperCase() > b.name.toUpperCase())
382+
{
383+
return 1;
384+
}
383385
}
384386
else if(a.updateTime > b.updateTime)
385387
{

0 commit comments

Comments
 (0)