mirror of
https://github.com/google/blockly.git
synced 2026-01-10 18:37:09 +01:00
* Adding new minimap demo * Basic code style changes. Adding a few more comments. Return early if disableScrollChange in onScrollChange listener. * Adding horizontal scrolling. Changed scroll change callbacks from onScroll_ to setHandlePosition. onScroll_ is not challed when workspace is dragged. * Registering mousemove and mouseup listener in mousedown event. Mousemove and Mouseup events are now listening over document. * Adding the remove variable modal and functionality to accessible Blockly. (#1011) * Minimap position bug fix for browsers other than chrome. Added touch support. * Adding an add variable modal to accessible Blockly. (#1015) * Adding the remove variable modal and functionality to accessible Blockly. * Adding the add variable modal for accessible Blockly. * Block browser context menu in the toolbox and flyout * Add links to the dev registration form and contributor guidelines * Miscellaneous comment cleanup * Adding the common modal class. (#1017) Centralizes accessible modal behavior. * - Changed error message referencing 'procedure' instead of 'function' (#1019) - Added iOS specific UI messages - Fixed bug with js_to_json.py script where it didn't recognize ' character * - Allows use of Blockly's messaging format for category name, colour,… (#1028) ...in toolbox XML. - Updated code editor demo to use this message format - Re-built blockly_compressed.js * Making text_count use a text color (like text_length, which also returns a number). (#1027) * Enable google/blockly with continuous build on travis ci (#1023) (#1035) * create .travis for ci job * initial checkin for blocky-web travis ci job * rename file to .travis.yaml for typo * remove after_script * added cache * rename .travis.yaml to .travis.yml * Update .travis.yml * include build script * fix yaml file format issue * debug install part * debug build issue * Update .travis.yml * remove cache for now * Update .travis.yml * Update .travis.yml * Update .travis.yml * more debug info * Update .travis.yml * Update .travis.yml * fix typo * installing chrome browser * remove chrome setting config * run build.py as part of npm install * Update .travis.yml * update karma dependency * use karma as test runner * fix typo * remove karma test for now * Update .travis.yml * Update package.json * add npm test target * add browserstack-runner depdendency * update browser support * fix typo for test target * fix chrome typo * added closure dependency * add google-closure-library * include blockly_uncompressed.js and core.js dependency * uncomment out core/*.js files * add kama job as part of install * remove browserstack add on for now * fix karma config typo * add karma-closure * add os support * remove typo config * include more closure files * change os back to linux * use closure-library from node_modules * change log level back to INFO * change npm test target to use open browser command instead of karma * change travis test target to use open command instead of karma * list current directory * find what's in current dir * typo command * Update .travis.yml * typo again * open right index.html * use right path for index.html * xdg-open to open default browser on travis * exit browser after 5s wait * change timeout to 1 min * exit after opening up browser * use browser only * use karma * remove un-needed dependency * clean up script section * fix typo * update build status on readme * initial commit for selenium integration tests * update selenium jar path * fix test_runner.js typo * add more debug info * check java version * add && instead of 9288 * fix java path * add logic to check if selenium is running or not * add some deugging info * initial commit to get chromedriver * add chromedriver flag * add get_chromedriver.sh to package.json and .travel * change browser to chrome for now * fix path issue * update chromdriver path * fix path issue again * more debugging * add debug msg * fix typo * minor fix for getting chromedriver * install latest chrome browser * clean up pakcage.json * use npm target for test run * remove removing trailing comma * fix another trailing comma * updated travis test target * clean up scripts * not sure nmp run preinstall * redirect selenium log to tmp file * revert writing console log to file * update test summary * more clean up * minor clean up before pull request * resolved closure-library conflict 1. add closure-library to dependencies instead of devDependencies. 2. add lint back in scripts block * fix typo (adding comma) in script section * Renames Blockly.workspaceDragSurface to Blockly.WorkspaceDragSurface. Fixes #880. * Ensure useDragSurface is a boolean. Fixed #988 * use pretest instead of preinstall in package.json (#1043) * cherry pick for pretest fix * put pretest target to test_setup.sh * fix conflict * cherry pick for get_chromedriver.sh * add some sleep to wait download to finish * use node.js stable * use npm test target * field_angle renders degree symbol consistently. Fixes #973 * bumpNeighbours_ function moved to block_svg. Fixed #1009 * Update RegEx in js-to-json to match windowi eol (#1050) The current regex only works with the "\n" line endings as it expects no characters after the optional ";" at the end of the line. In windows, if it adds the "\r" it counts as a characters and is not part of the line terminator so it doesn't match. * Fix French translation of "colour with rgb" block (#1053) "colorier", which is currently used, is a verb and proposed "couleur" is a noun: the block in question does not change colour of anything, it creates new colour instead, thus noun is more applicable. Also, noun is used in French translation of "random colour" block: "couleur aléatoire". * Enforcing non-empty names on value inputs and statement inputs. (#1054) * Correcting #1054 (#1056) single quotes. better logic. * Created a variable model with name, id, and type. Created a jsunit test file for variable model. * Change how blockly handles cursors. The old way was quite slow becau… (#1057) * Change how blockly handles cursors. The old way was quite slow because it changed the stylesheet directly. See issue #981 for more details on implementation and tradeoffs. This changes makes the following high level changes: deprecate Blockly.Css.setCursor, use built in open and closed hand cursor instead of custom .cur files, add css to draggable objects to set the open and closed hand cursors. * Rebuild blockly_uncompressed to pick up a testing change to make travis happy. Fix a build warning from a multi-line string in the process. (#1059) * Merge master into develop (#1063) - pick up translation changes - clean up trailing spaces * use goog.string.startswith instead of string.startswith (#1065) * New jsinterpreter demo includes wait block. Both demos have improved UI for clarity. (#1001) Refactor of interpreter demo * Renamed demos/interpreter/index.html as demos/interpreter/step-execution.html (including redirect), and added demos/interpreter/async-execution.html. * Refactored code to automatically generate/parse the blocks, eliminating the need for a "Parse JavaScript" button. Code is still shown in alert upon stepping to the first statement. Print statements now write to output <textarea> instead of modal dialogs. * VariableMap and functions added. * Create separate file for VariableMap and its functions. * Fix #1069 (#1073) * VariableMap and functions added. * Fix #1051 (#1084) * Improve errors when validating JSON block definitions. (#1086) goog.asserts to not run from blockly_compressed.js. User data validation should always run. * Dragging changes, rebased on develop (#1078) * Add block drag surface translateSurfaceBy * Add dragged connection manager * Add gesture.js * Add GestureHandler * Implemented gesture skeleton * Most basic workspace dragging * Add dragged connection manager * cleanup * doc * more cleanup * Add gesture handler * Add translateSurfaceInternal * core/block_dragger.js * cleanup * Pull in changes to dragged connection manager * Pull in changes to dragged connection manager * comments * more annotations * Add workspace dragger * Add coordinate annotations * Start on block dragging * Limit number of concurrent gestures * Add some TODOs * start using dragged connection manager * Set origin correctly for dragging blocks * Connect or delete at the end of a block drag. * cleanup * handle field clicks and block + workspace right-clicks * move code into BlockDragger class, but still reach into Gesture internals a lot * Clean up block dragger * Call blockDragger constructor with correct arguments * Enable block dragging in a mutator workspace * Add workspace dragger * click todos * Drag flyout with background * more dragging from flyout * nit * fix dragging from flyouts * Remove unused code and rename gestureHandler to gestureDB * Rename gesture handler * Added some jsdoc in gesture.js * Update some docs * Move some code to block_svg and clean up code * Lots of coordinate annotations * Fix block dragging when zoomed. * Remove built files from branch * More dragging work (#1026) -- Drag bubbles while dragging blocks -- Use bindEventWithChecks to work in touch on Android. Not tested anywhere else yet. -- Handle dragging blocks while zoomed -- Handle dragging blocks in mutators -- Handle right-clicks (I hope) -- Removed lots of unused code * More dragging work (#1048) - Removed gestureDB - Removing uses of terminateDrag - Cleaned up disposal code * Dragging bugfixes (#1058) - Get rid of flyout.dragMode_ and blockly.dragMode_ - Make drags from the flyout start from the top block in the group - Block tooltips from being scheduled or shown during gestures - Don't resize mutator bubbles mid-drag * Fix events in new dragging (#1060) * rebuild for testing * unbuild * Fix events * rebuild * Fix up cursors * Use language files from develop * Remove handled TODOS * attempt to fix IE rerendering bug, and recalculate workspace positions on scroll * Rebuild all the things * Comment cleanup; annotations; delete unused variables. * Tidy up context menu code. (#1081) * add osx travis test run job (#1074) * Names are correctly fetched from VariableModels! * add more wait time for test setup (#1091) * Work around timing issue with travis osx issue (#1092) * add more wait time for test setup * increase selenium wait time * add more wait * Fix #1077 by adding a rule to cover the toolbox labels too. (#1099) * Assign variable UUID to field_variable dropdown. * Change registration link to a static one (#1106) This lets us redirect to a different form if we change it in the future. * Edit generators to read in Variable Models. * Add VariableMap requirement to workspace. * Changed parameter name in workspace for clarity. * Add type, id, and info to the generated xml. Add xml tests for fieldToDom. Update workspace tests to pass with new changes. * Fix apostrophe in tooltips and helpurls (#1111) * Click events on shadow blocks have the correct id (#1089) * Add image_onclick option (#1080) * Cleanup: semicolons, spacing, etc. (#1116) * Spelling. Spelling is hard. * Add variable info to xml generated in variables.js * Add missing CLAs info to the contributing file (#1119) * Add missing CLAs info to the contributing file * Added larger changes paragraph * Replacing latest prettifier hosted in repo with latest version at rawgit CDN. (#1120) * Forgot update code demo (#1121) * Move audio code to a new file (#1122) * move audio code to a new file * dispose * null check * Make flyout get variables from target workspace's variableMap. * Require VariableModel in field_variable.js. * Update contributing.md (#1126) * Include variables at top of serialization. * Move blockSvg.getHeightWidth to block_render_svg.js (#1118) * Deserialization variables at top. * Create grid object (#1131) * Create grid object * Doc * Units! Thanks @RoboErikG * Appease eslint: semicolons and such. * Deserialization variables at top. * Setting up accessible Blockly for Closure compilation. (#1134) Moving closure compilation into the build file. Fixing up goog.requires for accessible blockly. Adding accessible to the build script. * Fix #1109 * Adding command-line options to the buildscript. (#1136) * Fix for travis-ci testing failure (#1141) It looks like the default configuration for Travis might have changed. Adding a manual step to install webdriverio. * Convert text_join block to JSON + mutator format (#1140) * Clean up and create test utilities file. * Add BLOCK events and constructor tests. * Convert more text blocks to json (#1147) * Convert more text blocks to json Converts the mutator blocks for text_join and the text_append block to JSON format. * Fixing modals so they're announced on focus, and changing variables t… (#1030) * Fixing modals so they're announced on focus, and changing variables to only react to enter, not onChange. * Adding a temp index. * Whoops - added it in the wrong spot. * Adding automatically-generated variable lists to the accessible toolbox. (#1149) Fixing a bug with the core-only uncompressed file not finding its own directory. * Field Variable setValue() looks up variable. * Wrap Error in Try Finally Block. * Changing the build file to allow forced rebuilding of the msg files. (#1158) * Split flyout into flyout_base, flyout_horizontal, and flyou_vertical * Rename flyout to flyout_base * flyout_base minus horizontal and vertical code * Add flyout_vertical and flyout_horizontal * review fixes + toolbox and workspace use * Fix hat block case * rebuild uncompressed * Fix travis problem * Fix build problem * Add VAR events. * Correctly named block events called. * Fire VAR events and test. * Create utility function for checking variable values. * In DropdownCreate check for Msg.DELETE_VARIABLE. * Test Delete Variable Twice. * Convert more text blocks to JSON format (#1163) * Convert more text blocks to JSON format Converts text_charAt, text_indexOf, text_isEmpty, and text_length to JSON. Includes a rebuild to pick up message changes. * Fixing the accessible variable stuff so it interacts correctly with (#1170) variableMap. * createVariable in workspaceSvg takes in id and type. * Followup RefreshToolbox. * Fixing an error with block messages and ordering. (#1171) * Remove out of date todo comments. * Fix checkbox delete bug. * Fixing variable dropdowns so they select the correct option. (#1184) * Always open flyout fields are editable. * Fixing the tree service so it doesn't treat unknown block deletion (#1182) as an error, and turning off keypresses on the workspace when the variable modals are open. * Revamping mostly gesture tests. * Merge master to develop (#1189) * Merge master into develop (#1063) - pick up translation changes - clean up trailing spaces * Rebuild for translations * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Cherrypick a fix for #1069 and rebuild (#1075) * Fix #1069 (#1073) * rebuild * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Rebuild compressed files * Add some translatewiki annotations back into msg/messages.js * Rebuild msg files * Fix flyout dropdown bug. * Fix python and php procedures. * Dropdown Create does not create a missing variable twice. * Fire field variable change event with variable value, not name. * Fix #1160 (#1197) Fix "Connection UI Effect not playing on block connect" * Only add a block in the flyout if it is not disabled (#1204) * Only add a block in the flyout if it is not disabled * PR feedback * remove previous fix * Fix issue with compression stripping dropdown options (#1207) * Get some accessible files back from develop * rebuild
610 lines
22 KiB
JavaScript
610 lines
22 KiB
JavaScript
/**
|
|
* AccessibleBlockly
|
|
*
|
|
* Copyright 2016 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 Angular2 Service that handles keyboard navigation on workspace
|
|
* block groups (internally represented as trees). This is a singleton service
|
|
* for the entire application.
|
|
*
|
|
* @author madeeha@google.com (Madeeha Ghori)
|
|
*/
|
|
|
|
goog.provide('blocklyApp.TreeService');
|
|
|
|
goog.require('blocklyApp.UtilsService');
|
|
|
|
goog.require('blocklyApp.AudioService');
|
|
goog.require('blocklyApp.BlockConnectionService');
|
|
goog.require('blocklyApp.BlockOptionsModalService');
|
|
goog.require('blocklyApp.NotificationsService');
|
|
goog.require('blocklyApp.VariableModalService');
|
|
|
|
|
|
blocklyApp.TreeService = ng.core.Class({
|
|
constructor: [
|
|
blocklyApp.AudioService,
|
|
blocklyApp.BlockConnectionService,
|
|
blocklyApp.BlockOptionsModalService,
|
|
blocklyApp.NotificationsService,
|
|
blocklyApp.UtilsService,
|
|
blocklyApp.VariableModalService,
|
|
function(
|
|
audioService, blockConnectionService, blockOptionsModalService,
|
|
notificationsService, utilsService, variableModalService) {
|
|
this.audioService = audioService;
|
|
this.blockConnectionService = blockConnectionService;
|
|
this.blockOptionsModalService = blockOptionsModalService;
|
|
this.notificationsService = notificationsService;
|
|
this.utilsService = utilsService;
|
|
this.variableModalService = variableModalService;
|
|
|
|
// The suffix used for all IDs of block root elements.
|
|
this.BLOCK_ROOT_ID_SUFFIX_ = blocklyApp.BLOCK_ROOT_ID_SUFFIX;
|
|
// Maps tree IDs to the IDs of their active descendants.
|
|
this.activeDescendantIds_ = {};
|
|
// Array containing all the sidebar button elements.
|
|
this.sidebarButtonElements_ = Array.from(
|
|
document.querySelectorAll('button.blocklySidebarButton'));
|
|
}
|
|
],
|
|
scrollToElement_: function(elementId) {
|
|
var element = document.getElementById(elementId);
|
|
var documentElement = document.body || document.documentElement;
|
|
if (element.offsetTop < documentElement.scrollTop ||
|
|
element.offsetTop > documentElement.scrollTop + window.innerHeight) {
|
|
window.scrollTo(0, element.offsetTop - 10);
|
|
}
|
|
},
|
|
|
|
isLi_: function(node) {
|
|
return node.tagName == 'LI';
|
|
},
|
|
getParentLi_: function(element) {
|
|
var nextNode = element.parentNode;
|
|
while (nextNode && !this.isLi_(nextNode)) {
|
|
nextNode = nextNode.parentNode;
|
|
}
|
|
return nextNode;
|
|
},
|
|
getFirstChildLi_: function(element) {
|
|
var childList = element.children;
|
|
for (var i = 0; i < childList.length; i++) {
|
|
if (this.isLi_(childList[i])) {
|
|
return childList[i];
|
|
} else {
|
|
var potentialElement = this.getFirstChildLi_(childList[i]);
|
|
if (potentialElement) {
|
|
return potentialElement;
|
|
}
|
|
}
|
|
}
|
|
return null;
|
|
},
|
|
getLastChildLi_: function(element) {
|
|
var childList = element.children;
|
|
for (var i = childList.length - 1; i >= 0; i--) {
|
|
if (this.isLi_(childList[i])) {
|
|
return childList[i];
|
|
} else {
|
|
var potentialElement = this.getLastChildLi_(childList[i]);
|
|
if (potentialElement) {
|
|
return potentialElement;
|
|
}
|
|
}
|
|
}
|
|
return null;
|
|
},
|
|
getInitialSiblingLi_: function(element) {
|
|
while (true) {
|
|
var previousSibling = this.getPreviousSiblingLi_(element);
|
|
if (previousSibling && previousSibling.id != element.id) {
|
|
element = previousSibling;
|
|
} else {
|
|
return element;
|
|
}
|
|
}
|
|
},
|
|
getPreviousSiblingLi_: function(element) {
|
|
if (element.previousElementSibling) {
|
|
var sibling = element.previousElementSibling;
|
|
return this.isLi_(sibling) ? sibling : this.getLastChildLi_(sibling);
|
|
} else {
|
|
var parent = element.parentNode;
|
|
while (parent && parent.tagName != 'OL') {
|
|
if (parent.previousElementSibling) {
|
|
var node = parent.previousElementSibling;
|
|
return this.isLi_(node) ? node : this.getLastChildLi_(node);
|
|
} else {
|
|
parent = parent.parentNode;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
},
|
|
getNextSiblingLi_: function(element) {
|
|
if (element.nextElementSibling) {
|
|
var sibling = element.nextElementSibling;
|
|
return this.isLi_(sibling) ? sibling : this.getFirstChildLi_(sibling);
|
|
} else {
|
|
var parent = element.parentNode;
|
|
while (parent && parent.tagName != 'OL') {
|
|
if (parent.nextElementSibling) {
|
|
var node = parent.nextElementSibling;
|
|
return this.isLi_(node) ? node : this.getFirstChildLi_(node);
|
|
} else {
|
|
parent = parent.parentNode;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
},
|
|
getFinalSiblingLi_: function(element) {
|
|
while (true) {
|
|
var nextSibling = this.getNextSiblingLi_(element);
|
|
if (nextSibling && nextSibling.id != element.id) {
|
|
element = nextSibling;
|
|
} else {
|
|
return element;
|
|
}
|
|
}
|
|
},
|
|
|
|
// Returns a list of all focus targets in the workspace, including the
|
|
// "Create new group" button that appears when no blocks are present.
|
|
getWorkspaceFocusTargets_: function() {
|
|
return Array.from(
|
|
document.querySelectorAll('.blocklyWorkspaceFocusTarget'));
|
|
},
|
|
getAllFocusTargets_: function() {
|
|
return this.getWorkspaceFocusTargets_().concat(this.sidebarButtonElements_);
|
|
},
|
|
getNextFocusTargetId_: function(treeId) {
|
|
var trees = this.getAllFocusTargets_();
|
|
for (var i = 0; i < trees.length - 1; i++) {
|
|
if (trees[i].id == treeId) {
|
|
return trees[i + 1].id;
|
|
}
|
|
}
|
|
return null;
|
|
},
|
|
getPreviousFocusTargetId_: function(treeId) {
|
|
var trees = this.getAllFocusTargets_();
|
|
for (var i = trees.length - 1; i > 0; i--) {
|
|
if (trees[i].id == treeId) {
|
|
return trees[i - 1].id;
|
|
}
|
|
}
|
|
return null;
|
|
},
|
|
|
|
getActiveDescId: function(treeId) {
|
|
return this.activeDescendantIds_[treeId] || '';
|
|
},
|
|
// Set the active desc for this tree to its first child.
|
|
initActiveDesc: function(treeId) {
|
|
var tree = document.getElementById(treeId);
|
|
this.setActiveDesc(this.getFirstChildLi_(tree).id, treeId);
|
|
},
|
|
// Make a given element the active descendant of a given tree.
|
|
setActiveDesc: function(newActiveDescId, treeId) {
|
|
if (this.getActiveDescId(treeId)) {
|
|
this.clearActiveDesc(treeId);
|
|
}
|
|
document.getElementById(newActiveDescId).classList.add(
|
|
'blocklyActiveDescendant');
|
|
this.activeDescendantIds_[treeId] = newActiveDescId;
|
|
|
|
// Scroll the new active desc into view, if needed. This has no effect
|
|
// for blind users, but is helpful for sighted onlookers.
|
|
this.scrollToElement_(newActiveDescId);
|
|
},
|
|
// This clears the active descendant of the given tree. It is used just
|
|
// before the tree is deleted.
|
|
clearActiveDesc: function(treeId) {
|
|
var activeDesc = document.getElementById(this.getActiveDescId(treeId));
|
|
if (activeDesc) {
|
|
activeDesc.classList.remove('blocklyActiveDescendant');
|
|
}
|
|
|
|
if (this.activeDescendantIds_[treeId]) {
|
|
delete this.activeDescendantIds_[treeId];
|
|
}
|
|
},
|
|
clearAllActiveDescs: function() {
|
|
for (var treeId in this.activeDescendantIds_) {
|
|
var activeDesc = document.getElementById(this.getActiveDescId(treeId));
|
|
if (activeDesc) {
|
|
activeDesc.classList.remove('blocklyActiveDescendant');
|
|
}
|
|
}
|
|
|
|
this.activeDescendantIds_ = {};
|
|
},
|
|
|
|
isTreeRoot_: function(element) {
|
|
return element.classList.contains('blocklyTree');
|
|
},
|
|
getBlockRootId_: function(blockId) {
|
|
return blockId + this.BLOCK_ROOT_ID_SUFFIX_;
|
|
},
|
|
// Return the 'lowest' Blockly block in the DOM tree that contains the given
|
|
// DOM element.
|
|
getContainingBlock_: function(domElement) {
|
|
var potentialBlockRoot = domElement;
|
|
while (potentialBlockRoot.id.indexOf(this.BLOCK_ROOT_ID_SUFFIX_) === -1) {
|
|
potentialBlockRoot = potentialBlockRoot.parentNode;
|
|
}
|
|
|
|
var blockRootId = potentialBlockRoot.id;
|
|
var blockId = blockRootId.substring(
|
|
0, blockRootId.length - this.BLOCK_ROOT_ID_SUFFIX_.length);
|
|
return blocklyApp.workspace.getBlockById(blockId);
|
|
},
|
|
isTopLevelBlock_: function(block) {
|
|
return !block.getParent();
|
|
},
|
|
// Returns whether the given block is at the top level, and has no siblings.
|
|
isIsolatedTopLevelBlock_: function(block) {
|
|
var blockHasNoSiblings = (
|
|
(!block.nextConnection ||
|
|
!block.nextConnection.targetConnection) &&
|
|
(!block.previousConnection ||
|
|
!block.previousConnection.targetConnection));
|
|
return this.isTopLevelBlock_(block) && blockHasNoSiblings;
|
|
},
|
|
safelyRemoveBlock_: function(block, deleteBlockFunc, areNextBlocksRemoved) {
|
|
// Runs the given deleteBlockFunc (which should have the effect of deleting
|
|
// the given block, and possibly others after it if `areNextBlocksRemoved`
|
|
// is true) and then does one of two things:
|
|
// - If the deleted block was an isolated top-level block, or it is a top-
|
|
// level block and the next blocks are going to be removed, this means
|
|
// the current tree has no more blocks after the deletion. So, pick a new
|
|
// tree to focus on.
|
|
// - Otherwise, set the correct new active desc for the current tree.
|
|
var treeId = this.getTreeIdForBlock(block.id);
|
|
|
|
var treeCeasesToExist = areNextBlocksRemoved ?
|
|
this.isTopLevelBlock_(block) : this.isIsolatedTopLevelBlock_(block);
|
|
|
|
if (treeCeasesToExist) {
|
|
// Find the node to focus on after the deletion happens.
|
|
var nextElementToFocusOn = null;
|
|
var focusTargets = this.getWorkspaceFocusTargets_();
|
|
for (var i = 0; i < focusTargets.length; i++) {
|
|
if (focusTargets[i].id == treeId) {
|
|
if (i + 1 < focusTargets.length) {
|
|
nextElementToFocusOn = focusTargets[i + 1];
|
|
} else if (i > 0) {
|
|
nextElementToFocusOn = focusTargets[i - 1];
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
this.clearActiveDesc(treeId);
|
|
deleteBlockFunc();
|
|
// Invoke a digest cycle, so that the DOM settles (and the "Create new
|
|
// group" button in the workspace shows up, if applicable).
|
|
setTimeout(function() {
|
|
if (nextElementToFocusOn) {
|
|
nextElementToFocusOn.focus();
|
|
} else {
|
|
document.getElementById(
|
|
blocklyApp.ID_FOR_EMPTY_WORKSPACE_BTN).focus();
|
|
}
|
|
});
|
|
} else {
|
|
var blockRootId = this.getBlockRootId_(block.id);
|
|
var blockRootElement = document.getElementById(blockRootId);
|
|
|
|
// Find the new active desc for the current tree by trying the following
|
|
// possibilities in order: the parent, the next sibling, and the previous
|
|
// sibling. (If `areNextBlocksRemoved` is true, the next sibling would be
|
|
// moved together with the moved block, so we don't check it.)
|
|
if (areNextBlocksRemoved) {
|
|
var newActiveDesc =
|
|
this.getParentLi_(blockRootElement) ||
|
|
this.getPreviousSiblingLi_(blockRootElement);
|
|
} else {
|
|
var newActiveDesc =
|
|
this.getParentLi_(blockRootElement) ||
|
|
this.getNextSiblingLi_(blockRootElement) ||
|
|
this.getPreviousSiblingLi_(blockRootElement);
|
|
}
|
|
|
|
this.clearActiveDesc(treeId);
|
|
deleteBlockFunc();
|
|
// Invoke a digest cycle, so that the DOM settles.
|
|
var that = this;
|
|
setTimeout(function() {
|
|
that.setActiveDesc(newActiveDesc.id, treeId);
|
|
document.getElementById(treeId).focus();
|
|
});
|
|
}
|
|
},
|
|
getTreeIdForBlock: function(blockId) {
|
|
// Walk up the DOM until we get to the root element of the tree.
|
|
var potentialRoot = document.getElementById(this.getBlockRootId_(blockId));
|
|
while (!this.isTreeRoot_(potentialRoot)) {
|
|
potentialRoot = potentialRoot.parentNode;
|
|
}
|
|
return potentialRoot.id;
|
|
},
|
|
// Set focus to the tree containing the given block, and set the tree's
|
|
// active desc to the root element of the given block.
|
|
focusOnBlock: function(blockId) {
|
|
// Invoke a digest cycle, in order to allow the ID of the newly-created
|
|
// tree to be set in the DOM.
|
|
var that = this;
|
|
setTimeout(function() {
|
|
var treeId = that.getTreeIdForBlock(blockId);
|
|
document.getElementById(treeId).focus();
|
|
that.setActiveDesc(that.getBlockRootId_(blockId), treeId);
|
|
});
|
|
},
|
|
showBlockOptionsModal: function(block) {
|
|
var that = this;
|
|
var actionButtonsInfo = [];
|
|
|
|
if (block.previousConnection) {
|
|
actionButtonsInfo.push({
|
|
action: function() {
|
|
that.blockConnectionService.markConnection(block.previousConnection);
|
|
that.focusOnBlock(block.id);
|
|
},
|
|
translationIdForText: 'MARK_SPOT_BEFORE'
|
|
});
|
|
}
|
|
|
|
if (block.nextConnection) {
|
|
actionButtonsInfo.push({
|
|
action: function() {
|
|
that.blockConnectionService.markConnection(block.nextConnection);
|
|
that.focusOnBlock(block.id);
|
|
},
|
|
translationIdForText: 'MARK_SPOT_AFTER'
|
|
});
|
|
}
|
|
|
|
if (this.blockConnectionService.canBeMovedToMarkedConnection(block)) {
|
|
actionButtonsInfo.push({
|
|
action: function() {
|
|
var blockDescription = that.utilsService.getBlockDescription(block);
|
|
var oldDestinationTreeId = that.getTreeIdForBlock(
|
|
that.blockConnectionService.getMarkedConnectionSourceBlock().id);
|
|
that.clearActiveDesc(oldDestinationTreeId);
|
|
|
|
var newBlockId = that.blockConnectionService.attachToMarkedConnection(
|
|
block);
|
|
that.safelyRemoveBlock_(block, function() {
|
|
block.dispose(false);
|
|
}, true);
|
|
|
|
// Invoke a digest cycle, so that the DOM settles.
|
|
setTimeout(function() {
|
|
that.focusOnBlock(newBlockId);
|
|
var newDestinationTreeId = that.getTreeIdForBlock(newBlockId);
|
|
|
|
if (newDestinationTreeId != oldDestinationTreeId) {
|
|
// The tree ID for a moved block does not seem to behave
|
|
// predictably. E.g. start with two separate groups of one block
|
|
// each, add a link before the block in the second group, and
|
|
// move the block in the first group to that link. The tree ID of
|
|
// the resulting group ends up being the tree ID for the group
|
|
// that was originally first, not second as might be expected.
|
|
// Here, we double-check to ensure that all affected trees have
|
|
// an active desc set.
|
|
if (document.getElementById(oldDestinationTreeId)) {
|
|
var activeDescId = that.getActiveDescId(oldDestinationTreeId);
|
|
var activeDescTreeId = null;
|
|
if (activeDescId) {
|
|
var oldDestinationBlock = that.getContainingBlock_(
|
|
document.getElementById(activeDescId));
|
|
activeDescTreeId = that.getTreeIdForBlock(
|
|
oldDestinationBlock);
|
|
if (activeDescTreeId != oldDestinationTreeId) {
|
|
that.clearActiveDesc(oldDestinationTreeId);
|
|
}
|
|
}
|
|
that.initActiveDesc(oldDestinationTreeId);
|
|
}
|
|
}
|
|
|
|
that.notificationsService.speak(
|
|
blockDescription + ' ' +
|
|
Blockly.Msg.ATTACHED_BLOCK_TO_LINK_MSG +
|
|
'. Now on attached block in workspace.');
|
|
});
|
|
},
|
|
translationIdForText: 'MOVE_TO_MARKED_SPOT'
|
|
});
|
|
}
|
|
|
|
actionButtonsInfo.push({
|
|
action: function() {
|
|
var blockDescription = that.utilsService.getBlockDescription(block);
|
|
|
|
that.safelyRemoveBlock_(block, function() {
|
|
block.dispose(true);
|
|
that.audioService.playDeleteSound();
|
|
}, false);
|
|
|
|
setTimeout(function() {
|
|
var message = blockDescription + ' deleted. ' + (
|
|
that.utilsService.isWorkspaceEmpty() ?
|
|
'Workspace is empty.' : 'Now on workspace.');
|
|
that.notificationsService.speak(message);
|
|
});
|
|
},
|
|
translationIdForText: 'DELETE'
|
|
});
|
|
|
|
this.blockOptionsModalService.showModal(actionButtonsInfo, function() {
|
|
that.focusOnBlock(block.id);
|
|
});
|
|
},
|
|
|
|
moveUpOneLevel_: function(treeId) {
|
|
var activeDesc = document.getElementById(this.getActiveDescId(treeId));
|
|
var nextNode = this.getParentLi_(activeDesc);
|
|
if (nextNode) {
|
|
this.setActiveDesc(nextNode.id, treeId);
|
|
} else {
|
|
this.audioService.playOopsSound();
|
|
}
|
|
},
|
|
onKeypress: function(e, tree) {
|
|
// TODO(sll): Instead of this, have a common ActiveContextService which
|
|
// returns true if at least one modal is shown, and false otherwise.
|
|
if (this.blockOptionsModalService.isModalShown() ||
|
|
this.variableModalService.isModalShown()) {
|
|
return;
|
|
}
|
|
|
|
var treeId = tree.id;
|
|
var activeDesc = document.getElementById(this.getActiveDescId(treeId));
|
|
if (!activeDesc) {
|
|
// The underlying Blockly instance may have decided blocks needed to
|
|
// be deleted. This is not necessarily an error, but needs to be repaired.
|
|
this.initActiveDesc(treeId);
|
|
activeDesc = document.getElementById(this.getActiveDescId(treeId));
|
|
}
|
|
|
|
if (e.altKey || e.ctrlKey) {
|
|
// Do not intercept combinations such as Alt+Home.
|
|
return;
|
|
}
|
|
|
|
if (document.activeElement.tagName == 'INPUT' ||
|
|
document.activeElement.tagName == 'SELECT') {
|
|
// For input fields, Esc, Enter, and Tab keystrokes are handled specially.
|
|
if (e.keyCode == 9 || e.keyCode == 13 || e.keyCode == 27) {
|
|
// Return the focus to the workspace tree containing the input field.
|
|
document.getElementById(treeId).focus();
|
|
|
|
// Note that Tab and Enter events stop propagating, this behavior is
|
|
// handled on other listeners.
|
|
if (e.keyCode == 27 || e.keyCode == 13) {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
}
|
|
}
|
|
} else {
|
|
// Outside an input field, Enter, Tab, Esc and navigation keys are all
|
|
// recognized.
|
|
if (e.keyCode == 13) {
|
|
// Enter key. The user wants to interact with a button, interact with
|
|
// an input field, or open the block options modal.
|
|
// Algorithm to find the field: do a DFS through the children until
|
|
// we find an INPUT, BUTTON or SELECT element (in which case we use it).
|
|
// Truncate the search at child LI elements.
|
|
e.stopPropagation();
|
|
|
|
var found = false;
|
|
var dfsStack = Array.from(activeDesc.children);
|
|
while (dfsStack.length) {
|
|
var currentNode = dfsStack.shift();
|
|
if (currentNode.tagName == 'BUTTON') {
|
|
currentNode.click();
|
|
found = true;
|
|
break;
|
|
} else if (currentNode.tagName == 'INPUT') {
|
|
currentNode.focus();
|
|
currentNode.select();
|
|
this.notificationsService.speak(
|
|
'Type a value, then press Escape to exit');
|
|
found = true;
|
|
break;
|
|
} else if (currentNode.tagName == 'SELECT') {
|
|
currentNode.focus();
|
|
found = true;
|
|
return;
|
|
} else if (currentNode.tagName == 'LI') {
|
|
continue;
|
|
}
|
|
|
|
if (currentNode.children) {
|
|
var reversedChildren = Array.from(currentNode.children).reverse();
|
|
reversedChildren.forEach(function(childNode) {
|
|
dfsStack.unshift(childNode);
|
|
});
|
|
}
|
|
}
|
|
|
|
// If we cannot find a field to interact with, we open the modal for
|
|
// the current block instead.
|
|
if (!found) {
|
|
var block = this.getContainingBlock_(activeDesc);
|
|
this.showBlockOptionsModal(block);
|
|
}
|
|
} else if (e.keyCode == 9) {
|
|
// Tab key. The event is allowed to propagate through.
|
|
} else if ([27, 35, 36, 37, 38, 39, 40].indexOf(e.keyCode) !== -1) {
|
|
if (e.keyCode == 27 || e.keyCode == 37) {
|
|
// Esc or left arrow key. Go up a level, if possible.
|
|
this.moveUpOneLevel_(treeId);
|
|
} else if (e.keyCode == 35) {
|
|
// End key. Go to the last sibling in the subtree.
|
|
var potentialFinalSibling = this.getFinalSiblingLi_(activeDesc);
|
|
if (potentialFinalSibling) {
|
|
this.setActiveDesc(potentialFinalSibling.id, treeId);
|
|
}
|
|
} else if (e.keyCode == 36) {
|
|
// Home key. Go to the first sibling in the subtree.
|
|
var potentialInitialSibling = this.getInitialSiblingLi_(activeDesc);
|
|
if (potentialInitialSibling) {
|
|
this.setActiveDesc(potentialInitialSibling.id, treeId);
|
|
}
|
|
} else if (e.keyCode == 38) {
|
|
// Up arrow key. Go to the previous sibling, if possible.
|
|
var potentialPrevSibling = this.getPreviousSiblingLi_(activeDesc);
|
|
if (potentialPrevSibling) {
|
|
this.setActiveDesc(potentialPrevSibling.id, treeId);
|
|
} else {
|
|
var statusMessage = 'Reached top of list.';
|
|
if (this.getParentLi_(activeDesc)) {
|
|
statusMessage += ' Press left to go to parent list.';
|
|
}
|
|
this.audioService.playOopsSound(statusMessage);
|
|
}
|
|
} else if (e.keyCode == 39) {
|
|
// Right arrow key. Go down a level, if possible.
|
|
var potentialFirstChild = this.getFirstChildLi_(activeDesc);
|
|
if (potentialFirstChild) {
|
|
this.setActiveDesc(potentialFirstChild.id, treeId);
|
|
} else {
|
|
this.audioService.playOopsSound();
|
|
}
|
|
} else if (e.keyCode == 40) {
|
|
// Down arrow key. Go to the next sibling, if possible.
|
|
var potentialNextSibling = this.getNextSiblingLi_(activeDesc);
|
|
if (potentialNextSibling) {
|
|
this.setActiveDesc(potentialNextSibling.id, treeId);
|
|
} else {
|
|
this.audioService.playOopsSound('Reached bottom of list.');
|
|
}
|
|
}
|
|
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
}
|
|
}
|
|
}
|
|
});
|