scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-08-28 22:30:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Persist comment state.

Browse source
This commit is contained in:
Karishma Chadha 2018-06-01 18:10:25 -04:00
parent ac91d8af65
commit 522706ccf8
2 changed files with 96 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/engine/blocks.js
View file

@ -247,7 +247,7 @@ class Blocks {
// ---------------------------------------------------------------------
/**
* Create event listener for blocks and variables. Handles validation and
* Create event listener for blocks, variables, and comments. Handles validation and
* serves as a generic adapter between the blocks, variables, and the
* runtime interface.
* @param {object} e Blockly "block" or "variable" event
@ -256,7 +256,8 @@ class Blocks {
blocklyListen (e, optRuntime) {
// Validate event
if (typeof e !== 'object') return;
if (typeof e.blockId !== 'string' && typeof e.varId !== 'string') {
if (typeof e.blockId !== 'string' && typeof e.varId !== 'string' &&
typeof e.commentId !== 'string') {
return;
}
const stage = optRuntime.getTargetForStage();
@ -356,6 +357,74 @@ class Blocks {
case 'var_delete':
stage.deleteVariable(e.varId);
break;
case 'comment_create':
if (optRuntime.getEditingTarget()) {
const currTarget = optRuntime.getEditingTarget();
currTarget.createComment(e.commentId, e.blockId, e.text,
e.xy.x, e.xy.y, e.width, e.height, e.minimized);
}
break;
case 'comment_change':
if (optRuntime) {
const currTarget = optRuntime.getEditingTarget();
if (!currTarget.comments.hasOwnProperty(e.commentId)) {
log.warn(`Cannot change comment with id ${e.commentId} because it does not exist.`);
return;
}
const comment = currTarget.comments[e.commentId];
const change = e.newContents_;
if (typeof change === 'object') {
if (change.hasOwnProperty('minimized')) {
comment.minimized = change.minimized;
break;
} else if (change.hasOwnProperty('width') && change.hasOwnProperty('height')){
comment.width = change.width;
comment.height = change.height;
break;
}
} else if (typeof change === 'string') {
comment.text = change;
break;
}
log.warn(`Unrecognized comment change: ${
JSON.stringify(change)} for comment with id: ${e.commentId}.`);
return;
}
break;
case 'comment_move':
if (optRuntime) {
const currTarget = optRuntime.getEditingTarget();
if (!currTarget.comments.hasOwnProperty(e.commentId)) {
log.warn(`Cannot change comment with id ${e.commentId} because it does not exist.`);
return;
}
const comment = currTarget.comments[e.commentId];
const newCoord = e.newCoordinate_;
comment.x = Math.floor(newCoord.x);
comment.y = Math.floor(newCoord.y);
}
break;
case 'comment_delete':
if (optRuntime) {
const currTarget = optRuntime.getEditingTarget();
if (!currTarget.comments.hasOwnProperty(e.commentId)) {
// If we're in this state, we have probably received
// a delete event from a workspace that we switched from
// (e.g. a delete event for a comment on sprite a's workspace
// when switching from sprite a to sprite b)
return;
}
delete currTarget.comments[e.commentId];
if (e.blockId) {
const block = currTarget.blocks.getBlock(e.blockId);
if (!block) {
log.warn(`Could not find block referenced by comment with id: ${e.commentId}`);
return;
}
delete block.comment;
}
}
break;
}
}