mirror of
https://github.com/google/blockly.git
synced 2026-01-18 06:17:12 +01:00
a65afdc189
* Remove cargo-culted bloat from CSS The `goog-menuitem-icon` and `goog-menuitem-noicon` classes are not present in Blockly. Blockly doesn’t support the CSS compiler, so #noflip has no effect. Shorten uncompressible warning string. Also remove the “Copied from Closure” notes. These were intended so that the CSS could be easily updated as the Closure Library evolved. We are no longer linked to the Closure Library. * Fix bug (in prod) where menu highlighting is lost Previously, open playground. Right-click on workspace. Mouse-over “Add comment” (it highlights). Mouse over “Download screenshot” (disabled option). Mouse over “Add comment” (highlighting is lost). Also remove `canHighlightItem` helper function. In theory this helps abstract the concept of non-highlightable options. But in practice it was only called in one of the several places that it should have been. This was a false abstraction. * Add support for Space/PgUp/PgDn/Home/End to menus * Eliminate calls to clearHighlighted The JSDoc for `setHighlightedIndex` specifically states, “If another item was previously highlighted, it is un-highlighted.” This is not what was implemented, but it should be. This commit adds the un-highlighting, and removes all the calls previously required to correct this bug. * Stop wrapping at top or bottom of menu. Real OS menus don’t wrap when one cursors off the top or bottom. Also, replace the overly complicated helper function with a simple 1/-1 step value. * Remove unused menu code * Simplify menu roles Remove unneeded sets to RTL on Menu (only MenuItem cares). * Fix lack of disposal for context menus. Context menus only disposed properly when an option was clicked. If they were dismissed by clicking outside the menu there was no disposal. This might result in a memory leak. Also un-extract (inject?) several now trivial functions. * Remove Component dependency from Menu & MenuItem Component is now only used by the category tree. * Remove unused functions in Component These were used by Menu/MenuItem. * Fix dependencies. * Record highlighted menu item by object, not index Less code, simpler. * Rename CSS classes goog-menu* to blocklyMenu* Old classes remain in DOM and are deprecated so that any custom CSS will continue to function. * Remove unused focus tracker in tree. * Add support for space/enter to toggle tree cats * Delete unsettable .isUserCollapsible_ from tree * Change visibility tags throughout menus. The previous tags were inherited from Closure and don’t reflect current usage in the Blockly codebase. The core/components/tree files are non-compliant in this regard, but I’m not going to update them since they need to be replaced and there’s no need to create an interim API change. * Remove property on DOM element linking to JS obj Performance is slower (O(n) rather than (O(1)), but ’n’ is the number of entries on the menu, so shouldn’t be more than a dozen or so. * Fixes a compile error (node != element) Usually we avoid parentElement in Blockly. That’s because it has very spotty behaviour with SVG. But in this case we are in pure HTML.
121 lines
2.6 KiB
JavaScript
121 lines
2.6 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2019 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview The class representing a marker.
|
|
* Used primarily for keyboard navigation to show a marked location.
|
|
* @author aschmiedt@google.com (Abby Schmiedt)
|
|
*/
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.Marker');
|
|
|
|
goog.require('Blockly.ASTNode');
|
|
goog.require('Blockly.navigation');
|
|
|
|
|
|
/**
|
|
* Class for a marker.
|
|
* This is used in keyboard navigation to save a location in the Blockly AST.
|
|
* @constructor
|
|
*/
|
|
Blockly.Marker = function() {
|
|
/**
|
|
* The colour of the marker.
|
|
* @type {?string}
|
|
*/
|
|
this.colour = null;
|
|
|
|
/**
|
|
* The current location of the marker.
|
|
* @type {Blockly.ASTNode}
|
|
* @private
|
|
*/
|
|
this.curNode_ = null;
|
|
|
|
/**
|
|
* The object in charge of drawing the visual representation of the current node.
|
|
* @type {Blockly.blockRendering.MarkerSvg}
|
|
* @private
|
|
*/
|
|
this.drawer_ = null;
|
|
|
|
/**
|
|
* The type of the marker.
|
|
* @type {string}
|
|
*/
|
|
this.type = 'marker';
|
|
};
|
|
|
|
/**
|
|
* Sets the object in charge of drawing the marker.
|
|
* @param {Blockly.blockRendering.MarkerSvg} drawer The object in charge of
|
|
* drawing the marker.
|
|
*/
|
|
Blockly.Marker.prototype.setDrawer = function(drawer) {
|
|
this.drawer_ = drawer;
|
|
};
|
|
|
|
/**
|
|
* Get the current drawer for the marker.
|
|
* @return {Blockly.blockRendering.MarkerSvg} The object in charge of drawing
|
|
* the marker.
|
|
*/
|
|
Blockly.Marker.prototype.getDrawer = function() {
|
|
return this.drawer_;
|
|
};
|
|
|
|
/**
|
|
* Gets the current location of the marker.
|
|
* @return {Blockly.ASTNode} The current field, connection, or block the marker
|
|
* is on.
|
|
*/
|
|
Blockly.Marker.prototype.getCurNode = function() {
|
|
return this.curNode_;
|
|
};
|
|
|
|
/**
|
|
* Set the location of the marker and call the update method.
|
|
* Setting isStack to true will only work if the newLocation is the top most
|
|
* output or previous connection on a stack.
|
|
* @param {Blockly.ASTNode} newNode The new location of the marker.
|
|
*/
|
|
Blockly.Marker.prototype.setCurNode = function(newNode) {
|
|
var oldNode = this.curNode_;
|
|
this.curNode_ = newNode;
|
|
if (this.drawer_) {
|
|
this.drawer_.draw(oldNode, this.curNode_);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Redraw the current marker.
|
|
* @package
|
|
*/
|
|
Blockly.Marker.prototype.draw = function() {
|
|
if (this.drawer_) {
|
|
this.drawer_.draw(this.curNode_, this.curNode_);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Hide the marker SVG.
|
|
*/
|
|
Blockly.Marker.prototype.hide = function() {
|
|
if (this.drawer_) {
|
|
this.drawer_.hide();
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Dispose of this marker.
|
|
*/
|
|
Blockly.Marker.prototype.dispose = function() {
|
|
if (this.getDrawer()) {
|
|
this.getDrawer().dispose();
|
|
}
|
|
};
|