mirror of
https://github.com/google/blockly.git
synced 2026-01-10 10:27:08 +01:00
* Add skeleton for workspace comments * XML parsing and encoding of workspace comments. * Minor fix: piping the height and width from xml to newWorkspaceComment * Move height and width into workspace_comment_svg * rename newWorkspaceComment to newComment * minor refactoring. PR changes * Functions for managing the comment's lifecycle * Add initial tests * Add another test * Add basic rendering of a comment. * Cleanup remaining highlighting steps from render * Fix lint * Fix aslant * Add basic comment translate * Simplify render code into one setPath method * Move steps to setPath_ * Remove svg elements when disposing of a comment; some code cleanup * Add a workspace comment on context menu click and position it where the initial context menu was clicked. * Minor rendering changes, fixes RTL. Fix positioning of new (context menu) comments while workspace is scaled. * PR feedback * Gesture code for dragging comments * Add comment (block drag) surface methods * minor comment fix * Comment fixes * Add comment dragger * Making rendered private * Require CommentDragger * Make basic comment dragging work * Increase the border around the comment to make a bigger drag handle * Remove typo * Allow comments to be selected. Highlight selected comment. Only edit comment on click. Updated comment rendering. * minor refactor: remove commented out code * PR comments * lint and rebuild * Fix renamed function call * Fix workspace getMetrics by storing comment size as a number, not a string * Enable comment deletion when dragging over the toolbox or trash can * Give issue references to some todos * Create a helper function for workspace comment creation * Integrate sam's workspace comments, using the bubble dragger * Remove comment_dragger references * Remove comment dragger.js * Remove pointer handling * Fix lint * Move comment XML functions into the comment files. * Fix tests * Fix type annotations * Fix comments on comments * Fix compiler errors related to visibility. * Fix merge issues and add an issue number to a TODO * Add a new message for default text on workspace comments, and rebuild * Add support for a context menu on workspace comment showing delete and duplication options. Add copy and paste support. * PR comment feedback * Show a delete icon on the comment when selected. Delete icon deletes the comment. Comment can be deleted if dragged onto the toolbox or the trash icon. A normal bubble cannot be deleted that way. * use isDeletable instead * Support drag of the comment during editing mode using the top handle. * Add skeletons for all workspace comment events * Rebuild with new comments * Get rid of confused TODO * JSDoc on a function * Fix broken tests * More PR feedback * Fix lint * Delete comment on mouse out, highlight on mouse down. * Fix lint. * Show delete hand cursor when dragging a comment to delete over the toolbox * Focus textarea on select * Add delete events * Remove workspace comment create event, and add TODO placeholder * Provide default values if comment height and width are missing in XML * Set comment handle fill to none by default * Rebuild * Comment de/serialization should include location. * Add comment move events, with undo and redo * Add comment change events * Move files up to core * Add package/private annotations wherever possible * Move the workspace comment events up to core and into a single file * Mark things package or private where possible * Get rid of unnecessary changes to messge files * Fix lint * Fix some review feedback * Make changes to the comment db happen in addTopComment and removeTopComment * Add css classes for toggling comment focus * Clean up css for comment focus * Rebuild
411 lines
12 KiB
JavaScript
411 lines
12 KiB
JavaScript
/**
|
|
* @license
|
|
* Visual Blocks Editor
|
|
*
|
|
* Copyright 2018 Google Inc.
|
|
* https://developers.google.com/blockly/
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Classes for all comment events.
|
|
* @author fenichel@google.com (Rachel Fenichel)
|
|
*/
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.Events.CommentBase');
|
|
goog.provide('Blockly.Events.CommentChange');
|
|
goog.provide('Blockly.Events.CommentCreate');
|
|
goog.provide('Blockly.Events.CommentDelete');
|
|
goog.provide('Blockly.Events.CommentMove');
|
|
|
|
goog.require('Blockly.Events');
|
|
goog.require('Blockly.Events.Abstract');
|
|
|
|
goog.require('goog.math.Coordinate');
|
|
|
|
|
|
/**
|
|
* Abstract class for a comment event.
|
|
* @param {Blockly.WorkspaceComment} comment The comment this event corresponds
|
|
* to.
|
|
* @extends {Blockly.Events.Abstract}
|
|
* @constructor
|
|
*/
|
|
Blockly.Events.CommentBase = function(comment) {
|
|
/**
|
|
* The ID of the comment this event pertains to.
|
|
* @type {string}
|
|
*/
|
|
this.commentId = comment.id;
|
|
|
|
/**
|
|
* The workspace identifier for this event.
|
|
* @type {string}
|
|
*/
|
|
this.workspaceId = comment.workspace.id;
|
|
|
|
/**
|
|
* The event group id for the group this event belongs to. Groups define
|
|
* events that should be treated as an single action from the user's
|
|
* perspective, and should be undone together.
|
|
* @type {string}
|
|
*/
|
|
this.group = Blockly.Events.group_;
|
|
|
|
/**
|
|
* Sets whether the event should be added to the undo stack.
|
|
* @type {boolean}
|
|
*/
|
|
this.recordUndo = Blockly.Events.recordUndo;
|
|
};
|
|
goog.inherits(Blockly.Events.CommentBase, Blockly.Events.Abstract);
|
|
|
|
/**
|
|
* Encode the event as JSON.
|
|
* @return {!Object} JSON representation.
|
|
*/
|
|
Blockly.Events.CommentBase.prototype.toJson = function() {
|
|
var json = {
|
|
'type': this.type
|
|
};
|
|
if (this.group) {
|
|
json['group'] = this.group;
|
|
}
|
|
if (this.commentId) {
|
|
json['commentId'] = this.commentId;
|
|
}
|
|
return json;
|
|
};
|
|
|
|
/**
|
|
* Decode the JSON event.
|
|
* @param {!Object} json JSON representation.
|
|
*/
|
|
Blockly.Events.CommentBase.prototype.fromJson = function(json) {
|
|
this.commentId = json['commentId'];
|
|
this.group = json['group'];
|
|
};
|
|
|
|
/**
|
|
* 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.
|
|
* @extends {Blockly.Events.CommentBase}
|
|
* @constructor
|
|
*/
|
|
Blockly.Events.CommentChange = function(comment, oldContents, newContents) {
|
|
if (!comment) {
|
|
return; // Blank event to be populated by fromJson.
|
|
}
|
|
Blockly.Events.CommentChange.superClass_.constructor.call(this, comment);
|
|
this.oldContents_ = oldContents;
|
|
this.newContents_ = newContents;
|
|
};
|
|
goog.inherits(Blockly.Events.CommentChange, Blockly.Events.CommentBase);
|
|
|
|
/**
|
|
* Type of this event.
|
|
* @type {string}
|
|
*/
|
|
Blockly.Events.CommentChange.prototype.type = Blockly.Events.COMMENT_CHANGE;
|
|
|
|
/**
|
|
* Encode the event as JSON.
|
|
* @return {!Object} JSON representation.
|
|
*/
|
|
Blockly.Events.CommentChange.prototype.toJson = function() {
|
|
var json = Blockly.Events.CommentChange.superClass_.toJson.call(this);
|
|
json['newContents'] = this.newContents_;
|
|
return json;
|
|
};
|
|
|
|
/**
|
|
* Decode the JSON event.
|
|
* @param {!Object} json JSON representation.
|
|
*/
|
|
Blockly.Events.CommentChange.prototype.fromJson = function(json) {
|
|
Blockly.Events.CommentChange.superClass_.fromJson.call(this, json);
|
|
this.newContents_ = json['newValue'];
|
|
};
|
|
|
|
/**
|
|
* Does this event record any change of state?
|
|
* @return {boolean} False if something changed.
|
|
*/
|
|
Blockly.Events.CommentChange.prototype.isNull = function() {
|
|
return this.oldContents_ == this.newContents_;
|
|
};
|
|
|
|
/**
|
|
* Run a change event.
|
|
* @param {boolean} forward True if run forward, false if run backward (undo).
|
|
*/
|
|
Blockly.Events.CommentChange.prototype.run = function(forward) {
|
|
var workspace = this.getEventWorkspace_();
|
|
var comment = workspace.getCommentById(this.commentId);
|
|
if (!comment) {
|
|
console.warn('Can\'t change non-existent comment: ' + this.commentId);
|
|
return;
|
|
}
|
|
var contents = forward ? this.newContents_ : this.oldContents_;
|
|
|
|
comment.setContent(contents);
|
|
};
|
|
|
|
/**
|
|
* Class for a comment creation event.
|
|
* @param {Blockly.WorkspaceComment} comment The created comment.
|
|
* Null for a blank event.
|
|
* @extends {Blockly.Events.CommentBase}
|
|
* @constructor
|
|
*/
|
|
Blockly.Events.CommentCreate = function(comment) {
|
|
if (!comment) {
|
|
return; // Blank event to be populated by fromJson.
|
|
}
|
|
Blockly.Events.CommentCreate.superClass_.constructor.call(this, comment);
|
|
|
|
this.xml = comment.toXmlWithXY();
|
|
};
|
|
goog.inherits(Blockly.Events.CommentCreate, Blockly.Events.CommentBase);
|
|
|
|
/**
|
|
* Type of this event.
|
|
* @type {string}
|
|
*/
|
|
Blockly.Events.CommentCreate.prototype.type = Blockly.Events.COMMENT_CREATE;
|
|
|
|
/**
|
|
* Encode the event as JSON.
|
|
* TODO (#1266): "Full" and "minimal" serialization.
|
|
* @return {!Object} JSON representation.
|
|
*/
|
|
Blockly.Events.CommentCreate.prototype.toJson = function() {
|
|
var json = Blockly.Events.CommentCreate.superClass_.toJson.call(this);
|
|
json['xml'] = Blockly.Xml.domToText(this.xml);
|
|
return json;
|
|
};
|
|
|
|
/**
|
|
* Decode the JSON event.
|
|
* @param {!Object} json JSON representation.
|
|
*/
|
|
Blockly.Events.CommentCreate.prototype.fromJson = function(json) {
|
|
Blockly.Events.CommentCreate.superClass_.fromJson.call(this, json);
|
|
this.xml = Blockly.Xml.textToDom('<xml>' + json['xml'] + '</xml>').firstChild;
|
|
};
|
|
|
|
/**
|
|
* Run a creation event.
|
|
* @param {boolean} forward True if run forward, false if run backward (undo).
|
|
*/
|
|
Blockly.Events.CommentCreate.prototype.run = function(forward) {
|
|
var workspace = this.getEventWorkspace_();
|
|
if (forward) {
|
|
var xml = goog.dom.createDom('xml');
|
|
xml.appendChild(this.xml);
|
|
Blockly.Xml.domToWorkspace(xml, workspace);
|
|
} else {
|
|
var comment = workspace.getCommentById(this.commentId);
|
|
if (comment) {
|
|
comment.dispose(false, false);
|
|
} else {
|
|
// Only complain about root-level block.
|
|
console.warn("Can't uncreate non-existent comment: " + this.commentId);
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Class for a comment deletion event.
|
|
* @param {Blockly.WorkspaceComment} comment The deleted comment.
|
|
* Null for a blank event.
|
|
* @extends {Blockly.Events.CommentBase}
|
|
* @constructor
|
|
*/
|
|
Blockly.Events.CommentDelete = function(comment) {
|
|
if (!comment) {
|
|
return; // Blank event to be populated by fromJson.
|
|
}
|
|
Blockly.Events.CommentDelete.superClass_.constructor.call(this, comment);
|
|
|
|
this.xml = comment.toXmlWithXY();
|
|
};
|
|
goog.inherits(Blockly.Events.CommentDelete, Blockly.Events.CommentBase);
|
|
|
|
/**
|
|
* Type of this event.
|
|
* @type {string}
|
|
*/
|
|
Blockly.Events.CommentDelete.prototype.type = Blockly.Events.COMMENT_DELETE;
|
|
|
|
/**
|
|
* Encode the event as JSON.
|
|
* TODO (#1266): "Full" and "minimal" serialization.
|
|
* @return {!Object} JSON representation.
|
|
*/
|
|
Blockly.Events.CommentDelete.prototype.toJson = function() {
|
|
var json = Blockly.Events.CommentDelete.superClass_.toJson.call(this);
|
|
return json;
|
|
};
|
|
|
|
/**
|
|
* Decode the JSON event.
|
|
* @param {!Object} json JSON representation.
|
|
*/
|
|
Blockly.Events.CommentDelete.prototype.fromJson = function(json) {
|
|
Blockly.Events.CommentDelete.superClass_.fromJson.call(this, json);
|
|
};
|
|
|
|
/**
|
|
* Run a creation event.
|
|
* @param {boolean} forward True if run forward, false if run backward (undo).
|
|
*/
|
|
Blockly.Events.CommentDelete.prototype.run = function(forward) {
|
|
var workspace = this.getEventWorkspace_();
|
|
if (forward) {
|
|
var comment = workspace.getCommentById(this.commentId);
|
|
if (comment) {
|
|
comment.dispose(false, false);
|
|
} else {
|
|
// Only complain about root-level block.
|
|
console.warn("Can't uncreate non-existent comment: " + this.commentId);
|
|
}
|
|
} else {
|
|
var xml = goog.dom.createDom('xml');
|
|
xml.appendChild(this.xml);
|
|
Blockly.Xml.domToWorkspace(xml, workspace);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Class for a comment move event. Created before the move.
|
|
* @param {Blockly.WorkspaceComment} comment The comment that is being moved.
|
|
* Null for a blank event.
|
|
* @extends {Blockly.Events.CommentBase}
|
|
* @constructor
|
|
*/
|
|
Blockly.Events.CommentMove = function(comment) {
|
|
if (!comment) {
|
|
return; // Blank event to be populated by fromJson.
|
|
}
|
|
Blockly.Events.CommentMove.superClass_.constructor.call(this, comment);
|
|
|
|
/**
|
|
* The comment that is being moved. Will be cleared after recording the new
|
|
* location.
|
|
* @type {?Blockly.WorkspaceComment}
|
|
*/
|
|
this.comment_ = comment;
|
|
|
|
/**
|
|
* The location before the move, in workspace coordinates.
|
|
* @type {!goog.math.Coordinate}
|
|
*/
|
|
this.oldCoordinate_ = comment.getXY();
|
|
|
|
/**
|
|
* The location after the move, in workspace coordinates.
|
|
* @type {!goog.math.Coordinate}
|
|
*/
|
|
this.newCoordinate_ = null;
|
|
};
|
|
goog.inherits(Blockly.Events.CommentMove, Blockly.Events.CommentBase);
|
|
|
|
/**
|
|
* Record the comment's new location. Called after the move. Can only be
|
|
* called once.
|
|
*/
|
|
Blockly.Events.CommentMove.prototype.recordNew = function() {
|
|
if (!this.comment_) {
|
|
throw new Error('Tried to record the new position of a comment on the ' +
|
|
'same event twice.');
|
|
}
|
|
this.newCoordinate_ = this.comment_.getXY();
|
|
this.comment_ = null;
|
|
};
|
|
|
|
/**
|
|
* Type of this event.
|
|
* @type {string}
|
|
*/
|
|
Blockly.Events.CommentMove.prototype.type = Blockly.Events.COMMENT_MOVE;
|
|
|
|
/**
|
|
* Override the location before the move. Use this if you don't create the
|
|
* event until the end of the move, but you know the original location.
|
|
* @param {!goog.math.Coordinate} xy The location before the move, in workspace
|
|
* coordinates.
|
|
*/
|
|
Blockly.Events.CommentMove.prototype.setOldCoordinate = function(xy) {
|
|
this.oldCoordinate_ = xy;
|
|
};
|
|
|
|
/**
|
|
* Encode the event as JSON.
|
|
* TODO (#1266): "Full" and "minimal" serialization.
|
|
* @return {!Object} JSON representation.
|
|
*/
|
|
Blockly.Events.CommentMove.prototype.toJson = function() {
|
|
var json = Blockly.Events.CommentMove.superClass_.toJson.call(this);
|
|
if (this.newCoordinate_) {
|
|
json['newCoordinate'] = Math.round(this.newCoordinate_.x) + ',' +
|
|
Math.round(this.newCoordinate_.y);
|
|
}
|
|
return json;
|
|
};
|
|
|
|
/**
|
|
* Decode the JSON event.
|
|
* @param {!Object} json JSON representation.
|
|
*/
|
|
Blockly.Events.CommentMove.prototype.fromJson = function(json) {
|
|
Blockly.Events.CommentMove.superClass_.fromJson.call(this, json);
|
|
|
|
if (json['newCoordinate']) {
|
|
var xy = json['newCoordinate'].split(',');
|
|
this.newCoordinate_ =
|
|
new goog.math.Coordinate(parseFloat(xy[0]), parseFloat(xy[1]));
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Does this event record any change of state?
|
|
* @return {boolean} False if something changed.
|
|
*/
|
|
Blockly.Events.CommentMove.prototype.isNull = function() {
|
|
return goog.math.Coordinate.equals(this.oldCoordinate_, this.newCoordinate_);
|
|
};
|
|
|
|
/**
|
|
* Run a move event.
|
|
* @param {boolean} forward True if run forward, false if run backward (undo).
|
|
*/
|
|
Blockly.Events.CommentMove.prototype.run = function(forward) {
|
|
var workspace = this.getEventWorkspace_();
|
|
var comment = workspace.getCommentById(this.commentId);
|
|
if (!comment) {
|
|
console.warn('Can\'t move non-existent comment: ' + this.commentId);
|
|
return;
|
|
}
|
|
|
|
var target = forward ? this.newCoordinate_ : this.oldCoordinate_;
|
|
// TODO: Check if the comment is being dragged, and give up if so.
|
|
var current = comment.getXY();
|
|
comment.moveBy(target.x - current.x, target.y - current.y);
|
|
};
|