Skip to content

Commit

Permalink
Merge pull request #566 from engaging-computing/dev
Browse files Browse the repository at this point in the history
Version 3.1.2
  • Loading branch information
kdvalin authored Apr 25, 2022
2 parents 1a28153 + 83372f9 commit 0f7787e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ The Engaging Computing Group develops new technologies to enable learners—yout
## Status
[![CircleCI](https://circleci.com/gh/engaging-computing/MYR.svg?style=shield)](https://circleci.com/gh/engaging-computing/MYR)

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


## Acknowledgments
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "myr",
"version": "3.1.1",
"version": "3.1.2",
"private": false,
"engines": {
"node": "^12.18.2"
Expand Down
16 changes: 9 additions & 7 deletions src/components/structural/header/ProjectView.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,15 @@ class Project extends React.Component {
* @returns 1 if project a should come before project b, -1 if b should come before a
*/
projectSort = (a,b)=>{
if(a.name.toUpperCase() < b.name.toUpperCase())
{
return -1;
}
else if(a.name.toUpperCase() > b.name.toUpperCase())
{
return 1;
if(a.name && b.name) {
if(a.name.toUpperCase() < b.name.toUpperCase())
{
return -1;
}
else if(a.name.toUpperCase() > b.name.toUpperCase())
{
return 1;
}
}
else if(a.updateTime > b.updateTime)
{
Expand Down

0 comments on commit 0f7787e

Please sign in to comment.