Integrates cursor into develop (#2710)

* Integrates cursor into blockly

* Fix review comments

* Add dispose to cursor

* Fixes dispose functionality

* Remove unnecessary dispose method
This commit is contained in:
alschmiedt
2019-07-25 11:14:40 -07:00
committed by GitHub
parent e8ec83a4a7
commit 6dc9a07810
8 changed files with 233 additions and 63 deletions

View File

@@ -46,6 +46,7 @@ goog.require('Blockly.FieldTextInput');
goog.require('Blockly.FieldNumber');
goog.require('Blockly.FieldVariable');
goog.require('Blockly.Generator');
goog.require('Blockly.Navigation');
goog.require('Blockly.Procedures');
goog.require('Blockly.Toolbox');
goog.require('Blockly.Tooltip');
@@ -77,6 +78,18 @@ Blockly.mainWorkspace = null;
*/
Blockly.selected = null;
/**
* Current cursor.
* @type {Blockly.Cursor}
*/
Blockly.cursor = null;
/**
* Whether or not we're currently in keyboard accessibility mode.
* @type {boolean}
*/
Blockly.keyboardAccessibilityMode = false;
/**
* All of the connections on blocks that are currently being dragged.
* @type {!Array.<!Blockly.Connection>}
@@ -194,6 +207,9 @@ Blockly.onKeyDown_ = function(e) {
if (e.keyCode == 27) {
// Pressing esc closes the context menu.
Blockly.hideChaff();
if (Blockly.keyboardAccessibilityMode) {
Blockly.Navigation.navigate(e);
}
} else if (e.keyCode == 8 || e.keyCode == 46) {
// Delete or backspace.
// Stop the browser from going back to the previous page.
@@ -247,8 +263,11 @@ Blockly.onKeyDown_ = function(e) {
} else if (e.keyCode == 90) {
// 'z' for undo 'Z' is for redo.
Blockly.hideChaff();
mainWorkspace.undo(e.shiftKey);
workspace.undo(e.shiftKey);
}
} else if (Blockly.keyboardAccessibilityMode
&& Blockly.Navigation.navigate(e)) {
return;
}
// Common code for delete and cut.
// Don't delete in the flyout.