From ec7c1226163b73eacef6a6b3fe9f9672e1f358ab Mon Sep 17 00:00:00 2001 From: Yueyu Date: Wed, 6 Oct 2021 13:58:54 +0800 Subject: [PATCH 1/2] save sprite name empty if it's empty --- src/painteditor/Paint.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/painteditor/Paint.js b/src/painteditor/Paint.js index c210ea28..cc808e4a 100644 --- a/src/painteditor/Paint.js +++ b/src/painteditor/Paint.js @@ -669,7 +669,7 @@ export default class Paint { ScratchJr.activeFocus = undefined; var spr = ScratchJr.getSprite(); var ti = e.target; - var val = ScratchJr.validate(ti.value, spr.name); + var val = ScratchJr.validate(ti.value, ''); ti.value = val.substring(0, ti.maxLength); ScratchJr.storyStart('Paint.nameBlur'); } @@ -1417,10 +1417,7 @@ export default class Paint { } static getLoadType (sid, cid) { - if (!cid) { - return 'none'; - } - if (sid && cid) { + if (sid) { return 'modify'; } return 'add'; From 829b3d3fd589ce6396190a86ee9ab3530305412e Mon Sep 17 00:00:00 2001 From: Yueyu Date: Tue, 12 Oct 2021 20:00:35 +0800 Subject: [PATCH 2/2] code lint --- src/painteditor/Paint.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/painteditor/Paint.js b/src/painteditor/Paint.js index cc808e4a..f37d71c6 100644 --- a/src/painteditor/Paint.js +++ b/src/painteditor/Paint.js @@ -667,7 +667,6 @@ export default class Paint { static nameBlur (e) { ScratchJr.activeFocus = undefined; - var spr = ScratchJr.getSprite(); var ti = e.target; var val = ScratchJr.validate(ti.value, ''); ti.value = val.substring(0, ti.maxLength); @@ -1331,7 +1330,7 @@ export default class Paint { Paint.addOrModifySprite(str, fcn); }); } else { - var type = Paint.getLoadType(spriteId, cname); + var type = Paint.getLoadType(spriteId); if ((cname != currentName) && (type == 'modify')) { ScratchJr.stage.currentPage.modifySpriteName(cname, spriteId); } else if (currentMd5 && (type == 'add')) { @@ -1402,7 +1401,7 @@ export default class Paint { static changePageSprite () { Paint.close(); var cname = document.forms.spriteform.name.value; - var type = Paint.getLoadType(spriteId, cname); + var type = Paint.getLoadType(spriteId); switch (type) { case 'modify': ScratchJr.stage.currentPage.modifySprite(saveMD5, cname, spriteId); @@ -1416,7 +1415,7 @@ export default class Paint { } } - static getLoadType (sid, cid) { + static getLoadType (sid) { if (sid) { return 'modify'; }