scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-04-18 10:15:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

fix: handle modern workspace comment events ()

Browse source 
* fix: handle modern workspace comment events

* fix: correctly access coordinates on events
This commit is contained in:
Aaron Dodson 2024-06-12 09:27:45 -07:00 • committed by GitHub
parent 484d15b1be
commit 88c097b1f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 17 deletions

33
src/engine/blocks.js
View file

@ -419,8 +419,8 @@ class Blocks {
case 'comment_create':
if (this.runtime.getEditingTarget()) {
const currTarget = this.runtime.getEditingTarget();
currTarget.createComment(e.commentId, e.blockId, e.text,
e.xy.x, e.xy.y, e.width, e.height, e.minimized);
currTarget.createComment(e.commentId, null, '',
e.json.x, e.json.y, e.json.width, e.json.height, false);
if (currTarget.comments[e.commentId].x === null &&
currTarget.comments[e.commentId].y === null) {
@ -430,8 +430,8 @@ class Blocks {
// comments, then the auto positioning should have taken place.
// Update the x and y position of these comments to match the
// one from the event.
currTarget.comments[e.commentId].x = e.xy.x;
currTarget.comments[e.commentId].y = e.xy.y;
currTarget.comments[e.commentId].x = e.json.x;
currTarget.comments[e.commentId].y = e.json.y;
}
}
this.emitProjectChanged();
@ -444,18 +444,7 @@ class Blocks {
return;
}
const comment = currTarget.comments[e.commentId];
const change = e.newContents_;
if (Object.prototype.hasOwnProperty.call(change, 'minimized')) {
comment.minimized = change.minimized;
}
if (Object.prototype.hasOwnProperty.call(change, 'width') &&
Object.prototype.hasOwnProperty.call(change, 'height')) {
comment.width = change.width;
comment.height = change.height;
}
if (Object.prototype.hasOwnProperty.call(change, 'text')) {
comment.text = change.text;
}
comment.text = e.newContents_;
this.emitProjectChanged();
}
break;
@ -474,6 +463,18 @@ class Blocks {
this.emitProjectChanged();
}
break;
case 'comment_collapse':
if (this.runtime.getEditingTarget()) {
const currTarget = this.runtime.getEditingTarget();
if (currTarget && !Object.prototype.hasOwnProperty.call(currTarget.comments, e.commentId)) {
log.warn(`Cannot change comment with id ${e.commentId} because it does not exist.`);
return;
}
const comment = currTarget.comments[e.commentId];
comment.minimized = e.newCollapsed;
this.emitProjectChanged();
}
break;
case 'comment_delete':
if (this.runtime.getEditingTarget()) {
const currTarget = this.runtime.getEditingTarget();

2
src/engine/comment.js
View file

@ -31,7 +31,7 @@ class Comment {
toXML () {
return `<comment id="${this.id}" x="${this.x}" y="${
this.y}" w="${this.width}" h="${this.height}" pinned="${
this.blockId !== null}" minimized="${this.minimized}">${xmlEscape(this.text)}</comment>`;
this.blockId !== null}" collapsed="${this.minimized}">${xmlEscape(this.text)}</comment>`;
}
// TODO choose min and defaults for width and height