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

Update CommentChange event to have a consistent API

Browse source
This commit is contained in:
Karishma Chadha 2018-06-06 19:11:09 -04:00
parent 3a94ec57b1
commit 437a207721
3 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
core/comment_events.js
View file

@ -124,8 +124,14 @@ Blockly.Events.CommentBase.prototype.getComment_ = function() {
* Class for a comment change event.
* @param {Blockly.WorkspaceComment} comment The comment that is being changed.
* Null for a blank event.
* @param {string} oldContents Previous contents of the comment.
* @param {string} newContents New contents of the comment.
* @param {!object} oldContents Object containing previous state of a comment's
* properties. The possible properties can be: 'minimized', 'text', or
* 'width' and 'height' together. Must contain the same property (or in the
* case of 'width' and 'height' properties) as the 'newContents' param.
* @param {!object} newContents Object containing the new state of a comment's
* properties. The possible properties can be: 'minimized', 'text', or
* 'width' and 'height' together. Must contain the same property (or in the
* case of 'width' and 'height' properties) as the 'oldContents' param.
* @extends {Blockly.Events.CommentBase}
* @constructor
*/
@ -184,21 +190,19 @@ Blockly.Events.CommentChange.prototype.run = function(forward) {
}
var contents = forward ? this.newContents_ : this.oldContents_;
if (goog.isString(contents)) {
comment.setText(contents);
return;
} else if (typeof contents == 'object') {
if (contents.hasOwnProperty('minimized')) {
if (comment instanceof Blockly.ScratchBlockComment) {
// TODO remove this check when workspace comments also get a minimized
// state
comment.setMinimized(contents.minimized);
}
return;
} else if (contents.hasOwnProperty('width') && contents.hasOwnProperty('height')) {
comment.setSize(contents.width, contents.height);
return;
if (contents.hasOwnProperty('minimized')) {
if (comment instanceof Blockly.ScratchBlockComment) {
// TODO remove this check when workspace comments also get a minimized
// state
comment.setMinimized(contents.minimized);
}
return;
} else if (contents.hasOwnProperty('width') && contents.hasOwnProperty('height')) {
comment.setSize(contents.width, contents.height);
return;
} else if (contents.hasOwnProperty('text')) {
comment.setText(contents.text);
return;
}
console.warn('Unrecognized comment change: ' + JSON.stringify(contents) + '; cannot undo/redo');

4
core/scratch_block_comment.js
View file

@ -210,7 +210,7 @@ Blockly.ScratchBlockComment.prototype.createEditor_ = function() {
Blockly.bindEventWithChecks_(textarea, 'change', this, function(_e) {
if (this.text_ != textarea.value) {
Blockly.Events.fire(new Blockly.Events.CommentChange(
this, this.text_, textarea.value));
this, {text: this.text_}, {text: textarea.value}));
this.text_ = textarea.value;
}
});
@ -438,7 +438,7 @@ Blockly.ScratchBlockComment.prototype.getLabelText = function() {
Blockly.ScratchBlockComment.prototype.setText = function(text) {
if (this.text_ != text) {
Blockly.Events.fire(new Blockly.Events.CommentChange(
this, this.text_, text));
this, {text: this.text_}, {text: text}));
this.text_ = text;
}
if (this.textarea_) {

4
core/workspace_comment.js
View file

@ -256,8 +256,8 @@ Blockly.WorkspaceComment.prototype.getText = function() {
*/
Blockly.WorkspaceComment.prototype.setText = function(text) {
if (this.content_ != text) {
Blockly.Events.fire(
new Blockly.Events.CommentChange(this, this.content_, text));
Blockly.Events.fire(new Blockly.Events.CommentChange(
this, {text: this.content_}, {text: text}));
this.content_ = text;
}
};