mirror of
https://github.com/scratchfoundation/scratch-blocks.git
synced 2025-08-06 11:09:54 -04:00
Merge remote-tracking branch 'Google/master' into google-master-april-1
# Conflicts: # blockly_compressed_horizontal.js # blockly_uncompressed_vertical.js # blocks_compressed.js # core/block.js # core/block_svg.js # core/blockly.js # core/connection.js # core/field_textinput.js # core/workspace_svg.js # generators/lua/lists.js # generators/lua/text.js # msg/js/he.js # msg/js/id.js # msg/js/sr.js # msg/js/zh-hant.js # msg/json/en.json
This commit is contained in:
commit
a65109f423
134 changed files with 1952 additions and 1235 deletions
core
|
@ -489,7 +489,6 @@ Blockly.Toolbox.TreeControl.prototype.createNode = function(opt_html, icon) {
|
|||
* @override
|
||||
*/
|
||||
Blockly.Toolbox.TreeControl.prototype.setSelectedItem = function(node) {
|
||||
Blockly.removeAllRanges();
|
||||
var toolbox = this.toolbox_;
|
||||
if (node == this.selectedItem_ || node == toolbox.tree_) {
|
||||
return;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue